diff options
29 files changed, 33410 insertions, 22607 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index 699f112c6..ae4ef3ae9 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Лице:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>Търсене за партньори и водачи</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Не може да бъде записън бекъп файл %1. Грешка: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Не може да бъде отворен бекъп файл: %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation>Данни на гмуркачески компютър прочетени успешно</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Настройките успешно записани на устройството</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Фърмуер успешно обновен</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Настройките успешно рестартирани</translation> </message> @@ -847,72 +847,72 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Бекъп файлове (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>Грешка при запис на бекъп файл. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Бекъп успешен</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>Вашите настройки бяха записани в: %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation>Бекъп на настройки на гмуркачески компютър</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation>XML бекъп грешка</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation>Върни настройки на гмуркачески компютър</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation>Грешка при XML връщане</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Настъпи грешка докато се връщаше бекъп файла. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>Връщане успешно</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>Вашите настройки бяха върнати успешно.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Изберете фърмуер файл</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>Всички файлове (*.*)</translation> </message> @@ -1071,22 +1071,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Модел</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Име на устройство</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Прякор</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Кликнете тук за да изтриете този гмуркачески компютър.</translation> </message> @@ -1094,18 +1094,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Връщане към OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation> начало</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation> край</translation> @@ -1114,97 +1114,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Дълбочина(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Температура(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Тежест(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Водолазен костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Бут.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Газ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -1212,87 +1212,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Разшири всички</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Свиване на всички</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Свиване на други</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Изтрий гмуркане (гмуркания) от пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Създай ново пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Добави гмуркане (гмуркания) веднага над пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Добави гмуркане(гмуркания) веднага под пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Слей пътуване с горно пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Слей пътуване с долно пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Изтрий гмуркане (гмуркания)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Маркирай гмуркания (гмуркане) като невалидни</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Слей избраните гмуркания</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Преномерирай гмуркане (гмуркания)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Измести времена</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Зареди изображения</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Отвори изображения</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1300,54 +1300,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Експорт формат</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Световна карта</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Селекция</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Избрани гмуркания</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Всички гмуркания</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1362,107 +1357,133 @@ <translation>Общ експорт</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation>DiveShare</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation>Дълбочина на изображения</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Общи настройки</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Subsurface числа</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation>Изтегли годишни статистики</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Експортирай само списъка</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Стилови настройки</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Шрифт</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Големина на шрифта</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Тема</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Светла</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Пясък</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF файлове (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV файлове (*.csv *.CSV)</translation> </message> @@ -1473,77 +1494,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Стойности разделени с запетая, които съдържат най-важната информация относно гмуркаческия профил.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Изпрати данните от гмуркането към сайта divelogs.de.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation>Изпрати данните към сайта dive-share.appspot.com</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML експорт на местонахождения, визуализирани на световната карта.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Subsurface XML формат</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation>Запиши дълбочините във файл.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Експорт на като UDDF файл</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Експорт на СSV файл като</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Експорт на световна карта</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML файлове (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Експорт на Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML файлове (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation>Запиши дълбочините</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Експортирай HTML файлове като</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Не може да бъде отворен файл %s</translation> </message> @@ -1582,7 +1609,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Време</translation> </message> @@ -1608,25 +1635,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Разделител на полета</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Единици</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Метрична</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Империална</translation> </message> @@ -1641,100 +1668,160 @@ <translation>Ръчнo добавени гмуркания</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation>Изберете подредба на ден, месец и година. Разделителя може да е всеки от символите .-/.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Формат на датата</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>дд.мм.гггг</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation>дд/мм/гггг</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation>гггг-мм-дд</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Гмуркане №</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation>Дата в форлмат дд.мм.гггг, гггг-мм-дд или мм/дд/гггг.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation>Дължина на гмурката в секунди или формат мин:сек</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Тагове</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Макс. дълбочина</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Настройка на полета</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Средна дълбочина</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Партньор</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Бележки</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Тежест</translation> </message> @@ -1846,77 +1933,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Дълбочина</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Време</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Налягане</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Температура:</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Цвят</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Налягане S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation>Околно налягане</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Налягане I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Въведено от потребителя</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Индекс на бутилка</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Таван</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1967,127 +2069,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Дълбочина</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Тежест</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Тежест(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Водолазен костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Бут.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Газ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Дълбочина(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Температура(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2191,54 +2293,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>ОК</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Грешка</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Опитай пак</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Намери Uemis леководолазен компютър</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Изберете регистър файл при изтегляне</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Регистър файлове (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Записването на libdivecomputer дъмп НЕ обновява списъка на гмуркания</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Изберете файл за libdivecomputer дъмп</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Дъмп файлове (*.bin)</translation> </message> @@ -2311,17 +2413,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation>Ключ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Стойност</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2360,17 +2487,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation>Фърмуера не може да бъде обновен!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>Не може да се осъществи връзка с леководолазния компютър.</translation> </message> @@ -2378,7 +2505,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Редактирай избраните местонахождения</translation> </message> @@ -2386,7 +2513,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Местонахождение:</translation> </message> @@ -2402,330 +2529,330 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Координати</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Водач</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Партньор</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Тагове</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Видимост</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Водолазен костюм</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Бележки</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Темп. на въздух</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Темп. на водата</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Бележки</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Екипировка</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Използвани газове</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Консумиран газ</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Макс. дълбочина</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Атмосф. налягане</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Време</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Общо време</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Консумация на газ</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation>Допълнителни данни</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation>Допълнителни данни от леководолазен комютър</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Време</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Информация</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Интервал</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Средна дълбочина</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Соленост</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Статистики</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Дълбочина</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Температура:</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Гмуркания</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Снимки</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Бутилки</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Тежести</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation>Направи промените</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation>Отмени промените</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Добави бутилка</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation>Добави система за тежест</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Tемп. на въздуха [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Темп. на водата [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Това пътуване се редактира.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Редактира се повече от едно гмуркане.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Това гмуркане се редактира.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Бележки за пътуване</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Местонахождение на пътуване</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/м</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Най-дълбоко гмуркане</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Най-плитко гмуркане</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation>Най-висок SAC на гмуркане</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation>Най-нисък SAC на гмуркане</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation>Среден SAC на всички избрани гмуркания</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation>Най-висока температура</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation>Най-ниска температура</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation>Средна температура на всички избрани гмуркания</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation>Най-дълго гмуркане</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation>Най-късо гмуркане</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation>Средна дължина на избраните гмуркания</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2734,17 +2861,17 @@ mixed from Air and using: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>и</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Изтрий промените?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Вие ще изтриете промените.</translation> </message> @@ -2752,92 +2879,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation>Експорт на гмуркачески регистри</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Превключи pHе диаграма</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Превключи калкулация на всички тъкани</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Превключи отчетен таван на гмуркачески компютър</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Превключи калкулиран таван</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Превключи NDL. TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Превключи калкулиран таван с 3м нарастване</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Настрой &леководолазен комютър</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Планирай гмуркане &наново</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Превключи показване на пулс</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>Превключи MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Превключи EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>Превключи SAC скорост</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Превключи линеал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Детайли за гмуркачески план</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Напечатай</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2850,486 +2977,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Регистър</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Изглед</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Помощ</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Вмъкване</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Нов регистър</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Нов</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Отвори регистър</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Отвори</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Запиши</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Запиши</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>З&апиши като</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Запиши като...</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>&Затвори</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Затвори</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>На&стройки</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Вмъкни &GPS данни от Subsurface уеб услуга</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>&Копирай компоненти на гмуркане</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>&Залепи компоненти на гмуркане</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>&Профил</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>&Информация</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>&Всички</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>&Следващ ГК</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>&За Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>&Глобус</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>&Вмъкни от divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>&Цял екран</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Превключи цял екран</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>&Провери за обновления</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>&Експорт</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation>Превключи pО₂ диаграма</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation>Превключи pN₂ диаграма</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Скалирай диаграмата</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation>Превключи изображения</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation>Преключи бутилки</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>&Филтрирай списъка</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation>Превключи тъканна диаграма</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Напечатай</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&Изход</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Изтегли от леководолазен &компютър</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Преномерирай</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>&Редактирай имена на устройства</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>Добави гмуркане</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Автоматично &групиране</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>Годишни &статистики</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>&Списък на гмуркания</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>&Предишен ГК</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Ляво</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Дясно</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>Ръководство за &потребителя</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>&Планирай гмуркане</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>&Вмъкни регистър файлове</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Вмъкни регистър файлове от други приложения</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Отвори файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Отмяна</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Моля затворете текущата редакция на гмуркане преди да затворите файла.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Моля запишете или отменете текущата редакция на гмуркане преди да добавите гмуркане.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Напечатай рунтайм таблица</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Желаете ли да запишете промените във файла %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Желаете ли да запишете промените във файла с данни?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Запиши промените?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Запиши файла като</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Отвори регистър файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation>Регистър файлове (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran файлове (*.can);;CSV файлове (*.csv);;DiveLog.de файлове (*.dld);;JDiveLog файлове (*.jlb);;Liquivision файлове (*.lvd);;MkVI файлове (*.txt);;Suunto файлове (*.sde *.db);;UDDF/UDCF файлове (*.uddf *.udcf);;XML файлове (*.xml);;Всички файлове (*)</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <source>Changes will be lost if you don't save them.</source> <translation>Промените ще бъдат изгубени ако не ги запишете.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Моля запишете или отменете текущата редакция на гмуркане преди да отворите нов файл.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Годишни статистики</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation> </message> @@ -3337,12 +3469,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>Филтърът показва %1 (от %2) гмуркания</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3400,387 +3572,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>По подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Единици</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Диаграма</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Език</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Мрежа</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Шрифт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Големина на шрифта</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Гмуркания</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>По подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Анимации</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Скорост</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Изтрий всички настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Върни всики настройки по подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Състема</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Метрична</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Империална</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Дълбочина</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>метър</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>фута</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>бара</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>литра</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>кб. фут</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>целзии</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>фаренхайт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>По подразбиране на системата</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Прокси тип</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Хост</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Порт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Изисква автентификация</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Потребителско име</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Парола</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Филтър</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Налягане</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Списъци и таблици</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Файл по подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Невалиден дисплей</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Бутилка по подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Използвай бутилка по подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface уеб услуга</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Потребителски ID по подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Запази потребителски ID локално</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Обем</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Температура:</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Тежест</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Единици за време</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Минути</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Секунди</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Покажи</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow на макс. дълбочина</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Общи</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Знаменател за скорост на изкачване/спускане</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Праг при показване на pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Праг при показване на pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Праг при показване на pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Макс. pO₂ при показване на MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Покажи таван на гмуркачески компютър в червено</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Покажи неизползвани бутилки в екипировка</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Покажи средна дълбочина</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Без прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Системно прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Нужен рестарт</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>За да смените успешно език е необходим рестарт на Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Ако изберете OK, всички настройки на Subsurface ще бъдат върнати по подразбиране. Това ще бъде изпълнено веднага.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Отвори файла по подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -3907,72 +4094,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Гмуркане №%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Макс. дълбочина: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Времетраене: %1 мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Използван газ:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Тагове:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Тежести:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Бележки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Водач:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Партньор:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Водолазен костюм:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Видимост:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Оценка:</translation> </message> @@ -3980,103 +4167,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (№%1 от %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Показването на NDL / TTS бе изключено поради прекалено дълго време за обработка на данните</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Направи първи гмуркачески компютър</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Изтрий този гмуркачески компютър</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Добави промяна на газа</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation>(Танк %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation>Добави set-point промяна</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Добави бележка</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Премахни събитие</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Премахни малки събития</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Редактирай име</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Промени налягането на бутилка %1 (текущо интерполирана като %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Покажи всички събития</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Скрий събития</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Скрий всички %1 събития?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Премахни избраните събития?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Редактирай име в показалец</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Потребителско име:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation> Името е прекалено дълго!</translation> </message> @@ -4104,22 +4291,22 @@ p, li { white-space: pre-wrap; } <translation>Затвори</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Средно</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Минимум</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Максимум</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Кликнете два пъти на глобус картата за да дефинирате местонахождение на гмуркането.</translation> </message> @@ -4187,12 +4374,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>Не може да се осъществи връзка с леководолазния компютър.</translation> </message> @@ -4206,12 +4393,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Нов стартов номер</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Нов номер</translation> </message> @@ -4219,12 +4406,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>Не може да се осъществи връзка с леководолазния компютър.</translation> </message> @@ -4303,12 +4490,12 @@ p, li { white-space: pre-wrap; } <translation>Коя дата и час са показани на снимката?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Отвори изображения</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4358,6 +4545,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4381,8 +4682,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Мутли-платформен гмуркачески регистър софтуер<br><span style='font-size: 8pt'>Линус Торвалдс, Дирк Хондел, Томас Канабрава и други, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4436,7 +4737,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Костюми:</translation> </message> @@ -4452,11 +4753,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Добави бутилка</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4466,7 +4762,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Тагове:</translation> </message> @@ -4516,54 +4812,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Провери за обновления</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface не успя да провери за обновления.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Грешка:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Моля проверете интернет връзката си.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation>Вие използватe последната версия на Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Има нова версия на Subsruface.<br/>Щракнете на:<br/><a href="%1">%1</a><br/> за да я изтеглите.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation>Има нова версия на Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation>Последната версия е %1. Моля проверете вашия OS доставчик за обновления.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation>Най-новата весия е</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Настъпи грешка при проверката за обновления.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4583,64 +4899,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Бихме желали да научим повече за нашите потребители, тяхните настройки и навици. Моля, отделете минута да попълните тази форма и да я изпратите към авторите на Subsurface. Моля, изберете всички опции, които се отнасят към вас.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Потребителско изследване</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Subsurface потребителско изследвание</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Развлекателен гмуркач</translation> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Тех. гмуркач</translation> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Заинтересован към планиране на гмуркания</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Тегля гмуркания от потдържан гмуркачески компютър</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Вмъквам гмуркания от друг софтуер / източници</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Ръчно въвеждам гмуркания</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Използвам Android компаньон програмата да запазвам местонахождения</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Моля напишете предложения (на английски) в следното поле</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Следната информация за вашата система ще бъде изпратена също</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4813,12 +5139,19 @@ OS CPU архитектура %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>Не може да се осъществи връзка с леководолазния компютър.</translation> </message> @@ -4826,79 +5159,79 @@ OS CPU архитектура %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Година > Месец / Пътуване</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Продължителност Общо</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Средно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Най-късо</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Най-дълго</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Дълбочина (%1) Средно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Минимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Максимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Средно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Темп. (%1) @@ -4914,13 +5247,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>бара</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4931,16 +5264,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>м</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>фута</translation> </message> @@ -4966,120 +5299,120 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>паунда</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) или (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>въздух</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>вградена</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>колан</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>глезен</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>нагръбна</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>щипка</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Не може да бъде прочетен '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>CSV файла %s не може да бъде отворен. Моля използвайте опцията "Вмъкни регистър файлове".</translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Проблем при Poseidon импорт: не може да бъде прочетен '%s'</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation>Позиция на мундщук OC</translation> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation>Позиция на мундщук CC</translation> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation>Позиция на мундщук - неопределена</translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation>Позиция на мундщук - няма връзка</translation> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation>Захранване изключено</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation>O₂ калибрацията не може да бъде извършена</translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation>O₂ калибрация</translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation>Няма подходящ Л.К. за файла '%s'</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Максималният потдържан брой на CSV колони е %d</translation> </message> @@ -5098,7 +5431,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation>батерия</translation> </message> @@ -5112,7 +5445,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>покачване</translation> @@ -5159,7 +5492,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5315,42 +5648,42 @@ Maximum</source> <translation>Грешка при рaзряд на стойности</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Събитие: изчаквание на действие от потребителя</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Грешка при регистриране на направление за събития</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Грешка при регистриране на направление за отменяне</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Грешка при вход на данни</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Не може да бъде създаден libdivecomputer контекст</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Не може да бъдe отворен %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Недостатъчни привилегии да бъде отврено устройсто %s %s (%s)</translation> </message> @@ -5369,222 +5702,254 @@ Maximum</source> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Базата данни не може да изпълни get_events. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Базата данни не може да изпълни get_tags. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Няма връзка към базата данни '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Грешка при заява към база данни '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Базата данни не може да изпълни get_cylinders. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. </source> - <translation>Базата данни не може да изпълни get_changes. + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Няма връзка към базата данни '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Базата данни не може да изпълни get_profile_sample. + <translation>Грешка при заява към база данни '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Не може да бъде отворен стилов файл %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Не може да бъде намерен газ %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Твърде много газови смеси</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Калкулирането на декомпресия е прекратено заради дълга продължителност</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>базирано на GFlow = %d и GFHigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurface гмуркачески план</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>дълбочина</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>времетраене</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>продължителност</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>газ</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <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="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <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="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1f бара)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Превключи газ към %s (SP = %.1f бара)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Превключи газ на %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Консумация на газ (CCR крака включени):</translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Консумация на газ:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Предупреждение:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>ВНИМАНИЕ: ТОВА Е НОВО ИЗПЪЛНЕНИЕ НА АГЛОРИТЪМА НА БУЛМАН И НА ПЛАНОВИКА, КОИТО НЕ СА ТЕСТВАНИ ДОСТАТЪЧНО. МОЛЯ НЕ ПЛАНУВАЙТЕ ИЗТИНСКИ ГМУРКАНИЯ БАЗИРАНИ НА ДАННИТЕ ТУК!</translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation>има повече газ от този на разположение в избраната бултилка</translation> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>няма достатъчно резерв за газово споделяне при изкачване!</translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s от %s (%.0f%s/%.0f%s в планирано покачване)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s по време на плануваното изкачване) на %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5593,70 +5958,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fбара </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fбара </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5665,7 +6030,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5674,14 +6039,14 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Стоп: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Стоп: неопр. време @ %.0f%s @@ -5689,77 +6054,77 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: неопр. време @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>В Deco </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %uмин @ %.0f%s (калк.) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>В Deco (калк.) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (калк.) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (калк.) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Калкулиран таван %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Тъкан %.0fмин: %.0f%s @@ -5767,71 +6132,77 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>пулс: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>лагер: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d мин</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 гмуркания)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 гмуркане)</translation> </message> @@ -5996,97 +6367,97 @@ EADD: %d%s <translation>(няма гмуркания)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Нед</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Пон</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Вт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Ср</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Чет</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Пет</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Съб</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Ян</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Март</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Юни</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Юли</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Сеп</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Нов</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Дек</translation> </message> diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index ad291dfe2..275456cfb 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Person:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>Søger efter makkere og divemasters</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Kunne ikke gemme backup fil %1. Fejl besked: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Kunne ikke åbne backup fil: %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> - <translation type="unfinished"/> + <translation>Detaljer fra dykkercomputeren er læst med succes</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Indstillinger er succesfuldt skevet til enheden</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Firmware er opdateret med succes</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Indstillinger for enheden er nulstillet</translation> </message> @@ -360,42 +360,42 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="466"/> <source>230LSB/Gauss</source> - <translation type="unfinished"/> + <translation>230LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="471"/> <source>330LSB/Gauss</source> - <translation type="unfinished"/> + <translation>330LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="476"/> <source>390LSB/Gauss</source> - <translation type="unfinished"/> + <translation>390LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="481"/> <source>440LSB/Gauss</source> - <translation type="unfinished"/> + <translation>440LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="486"/> <source>660LSB/Gauss</source> - <translation type="unfinished"/> + <translation>660LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="491"/> <source>820LSB/Gauss</source> - <translation type="unfinished"/> + <translation>820LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="496"/> <source>1090LSB/Gauss</source> - <translation type="unfinished"/> + <translation>1090LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="501"/> <source>1370LSB/Gauss</source> - <translation type="unfinished"/> + <translation>1370LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="587"/> @@ -412,7 +412,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="611"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1819"/> <source>Alt GF can be selected underwater</source> - <translation type="unfinished"/> + <translation>Alt GF kan vælges under vandet</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> @@ -644,7 +644,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2323"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2339"/> <source> cbar</source> - <translation type="unfinished"/> + <translation>cbar</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> @@ -676,7 +676,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> <source>Safety level</source> - <translation type="unfinished"/> + <translation>Sikkerheds niveau</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="916"/> @@ -684,29 +684,29 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2122"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2207"/> <source>%O₂</source> - <translation type="unfinished"/> + <translation>%O₂</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1124"/> <source>O₂ in calibration gas</source> - <translation type="unfinished"/> + <translation>O₂ i kalibrerings gas</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>pO₂ max</source> - <translation type="unfinished"/> + <translation>pO₂ max</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>pO₂ min</source> - <translation type="unfinished"/> + <translation>pO₂ min</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1290"/> <source>Altitude range</source> - <translation type="unfinished"/> + <translation>Højde rækkevidde</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1297"/> @@ -847,71 +847,72 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Backup filer (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>Det opstod en fejl under skrivning af backup fil: %s</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Backup færdig med succes</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>Dine indstillinger er gemt til: %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation>Backup af dykker computer indstillinger</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation>XML backup fejl</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation>Gendan dykker computer indstillinger</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation>XML gendannelses fejl</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> - <translation type="unfinished"/> + <translation>En fejl opstod under indlæsning af backup file +%1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>Gendannet med succes</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>Dine indstillinger er blevet gendannet med succes.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Vælg firmware fil</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>Alle filer(*.*)</translation> </message> @@ -951,7 +952,7 @@ <message> <location filename="../qt-ui/models.cpp" line="78"/> <source>O₂%</source> - <translation type="unfinished"/> + <translation>O₂%</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="79"/> @@ -984,12 +985,12 @@ <message> <location filename="../qt-ui/divecomponentselection.ui" line="23"/> <source>Component selection</source> - <translation type="unfinished"/> + <translation>Komponent valg</translation> </message> <message> <location filename="../qt-ui/divecomponentselection.ui" line="40"/> <source>Which components would you like to copy</source> - <translation type="unfinished"/> + <translation>Hvilke komponenter vil du kopiere</translation> </message> <message> <location filename="../qt-ui/divecomponentselection.ui" line="46"/> @@ -1070,22 +1071,22 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Enheds ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Kaldenavn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Klik her vil fjerne denne dykkercomputer.</translation> </message> @@ -1093,18 +1094,18 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>BailOut til OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>start</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>slut</translation> @@ -1113,97 +1114,97 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Bedømmelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Vægt(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Dragt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Cyl</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Lokation</translation> </message> @@ -1211,87 +1212,87 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Udvid alt</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Skjul alle</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Saml andre</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Fjern dyk fra tur</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Opret ny tur over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Tilføj dyk umiddelbart over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Tilføj dyk umiddelbart under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Flet tur med turen over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Flet tur med turen under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Slet dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Marker dyk som ugyldige</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Flet valgte dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Gen-Numerer dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Skift tid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Indlæs billeder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Åben billed filer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Billed filer (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1299,54 +1300,49 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Eksporter format</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Verdens kort</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Valg</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Valgte dyk</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Alle dyk</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1361,107 +1357,133 @@ fjerne den valgte dykkercomputer?</translation> <translation>Generel eksport</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> + <translation>DiveShare</translation> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Generelle indstillinger</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Subsurface numre</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation>Exporter årlig statistik</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Eksporter kun listen</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Udseende muligheder</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Font størrelse</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Lys</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Sand</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF filer (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV filer (*.csv *.CSV)</translation> </message> @@ -1472,77 +1494,83 @@ fjerne den valgte dykkercomputer?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Komma separeret værdier der indeholder de mest betydende informationer fra dykker profilen</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Send data til divelog.de hjemmeside</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> - <translation type="unfinished"/> + <translation>Send dykker data til dive-share.appspot.com webside</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML eksport af dykker lokationer, vist på kortet</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Subsurface originale XML format</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Eksporter UDDF fil som</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Eksporter CSV fil som</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Eksporter verdens kort</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML filer (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Eksporter Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML filer (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Exporter HTML filer som</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Kan ikke åbne filen %s</translation> </message> @@ -1581,7 +1609,7 @@ fjerne den valgte dykkercomputer?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Tid</translation> </message> @@ -1607,25 +1635,25 @@ fjerne den valgte dykkercomputer?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Felt seperator</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Enheder</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metrisk</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperial</translation> </message> @@ -1640,100 +1668,160 @@ fjerne den valgte dykkercomputer?</translation> <translation>Manuelle dyk</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> - <translation type="unfinished"/> + <translation>Vælg format for dag, måned og år. Adskillelses tegn kan være .-/. </translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Data format</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> - <translation type="unfinished"/> + <translation>dd.mm.åååå</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> - <translation type="unfinished"/> + <translation>mm/dd/åååå</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> - <translation type="unfinished"/> + <translation>åååå-mm-dd</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Dyk #</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> - <translation type="unfinished"/> + <translation>Dato i dd.mm.yyyy, yyyy-mm-dd eller mm/dd/yyyy format</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> - <translation type="unfinished"/> + <translation>Dykkets varighed i sekunder eller i min:sek format</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> - <translation type="unfinished"/> + <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Lokation</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Max dybde</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Felt konfiguration</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Gnm dybde</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Makker</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Noter</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Vægt</translation> </message> @@ -1845,77 +1933,92 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Tryk</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Farve</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Tryk S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation>Omgivende tryk</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Tryk I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Bruger tilføjet</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Flaske oversigt</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Loft</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1950,7 +2053,7 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="80"/> <source>Private dives will not appear in "related dives" lists, and will only be accessible if their URL is known.</source> - <translation type="unfinished"/> + <translation>Private dyk vil ikke fremstå i 'relaterede dyk' liste. Vil kun være tilgængelige hvis dets egen URL er kendt.</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="83"/> @@ -1966,127 +2069,127 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Bedømmelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Vægt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>fod</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Vægt(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Dragt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Cyl</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Lokation</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2190,54 +2293,54 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Fejl</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Prøv igen</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Find Uemis dykker computer</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Vælg logfil for computer download</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Logfiler (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Gem af libdivecomputer dump vil IKKE downloade dyk til listen</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Vælg fil for dykkercomputerens binære dump fil</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Dump filer (*.bin)</translation> </message> @@ -2310,17 +2413,42 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation>Nøgle</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Værdi</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2330,12 +2458,12 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> <source>Text label</source> - <translation type="unfinished"/> + <translation>Tekst etiket</translation> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> <source>Filter this list</source> - <translation type="unfinished"/> + <translation>Filtrer denne liste</translation> </message> </context> <context> @@ -2343,33 +2471,33 @@ fjerne den valgte dykkercomputer?</translation> <message> <location filename="../qt-ui/filterwidget.ui" line="73"/> <source>Reset filters</source> - <translation type="unfinished"/> + <translation>Slet filter</translation> </message> <message> <location filename="../qt-ui/filterwidget.ui" line="87"/> <source>Show/hide filters</source> - <translation type="unfinished"/> + <translation>Vis/skjul filtre</translation> </message> <message> <location filename="../qt-ui/filterwidget.ui" line="101"/> <source>Close and reset filters</source> - <translation type="unfinished"/> + <translation>Luk og nulstil filtre</translation> </message> </context> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation>Firmware update fejlede</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kunne ikke lave en forbindelse til dykker computeren</translation> </message> @@ -2377,7 +2505,7 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Editer valgte dykker lokationer</translation> </message> @@ -2385,7 +2513,7 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Sted:</translation> </message> @@ -2401,330 +2529,330 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Position</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Koordinater</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Makker</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Bedømmelse</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Sigtbarhed</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Dragt</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Luft temp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Vand temp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Noter</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Udstyr</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Brugt gas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Forbrugt gas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Max dybde</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Luft tryk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Dykker tid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Total tid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Gas forbrug</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation>Ekstra data</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation>Yderligere data fra dykker computeren</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Dyk info</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Interval</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Gnm dybde</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Saltindhold</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Statistik</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Fotos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Flasker </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Vægt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> - <translation type="unfinished"/> + <translation>Gem ændringer</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> - <translation type="unfinished"/> + <translation>Drop ændringer </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Tilføj flaske</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> - <translation type="unfinished"/> + <translation>Tilføj vægt system</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Luft temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Vand temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Turen er ved at blive rettet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Flere dyk bliver rettet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Dette dyk bliver rettet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Tur notater</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Tur lokation</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Dybeste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Laveste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation>Højeste total SAC på et dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation>Laveste total SAC på det dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation>Gennemsnitlig total SAC for alle valgte dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation>Højeste temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation>Laveste temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation>Gennemsnitlig temperatur af alle valgte dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation>Længste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation>Korteste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation>Gennemsnit længde af alle valgte dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2733,17 +2861,17 @@ blandes fra Luft ved brug: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>og</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Drop ændringerne?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Du er ved at droppe dine ændringer.</translation> </message> @@ -2751,92 +2879,92 @@ blandes fra Luft ved brug: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&Fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> - <translation type="unfinished"/> + <translation>Exporter dykker logs</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Skift pH2 graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Skift beregning af alle væv</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Skift DC rapporteret loft</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Skift beregnet loft</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Skift NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Skift beregnet loft med 3m stop</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Konfigurer &Dykker computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Genberegn &dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Skift hjerte frekvens</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>Skift MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Skift EAD,END,EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>Skift SAC rate</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Skift måler</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Dykkerplan detaljer</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Udskriv:</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2849,486 +2977,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Vis</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Hjælp</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Importer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Ny logbog</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Ny</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Crtl-N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Åben logbog</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Åben</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Crtl-O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Gem</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Gem</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Crtl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Ge&m som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Gem som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>&Luk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Luk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>I&ndstillinger</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importer &GPS data fra Subsurface webservice</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> - <translation type="unfinished"/> + <translation>&Kopier dykker komponenter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> - <translation type="unfinished"/> + <translation>&Indsæt dyk komponenter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>&Alt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>&Næste DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>&Om Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>&Globus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+l</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Importer fra divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>&Fuld skærm</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Skift fuld skærm</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>&Tjek for opdateringer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>&Eksporter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl-E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> - <translation type="unfinished"/> + <translation>pO₂graf fra/til</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> - <translation type="unfinished"/> + <translation>pN₂ graf fra/til</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> - <translation type="unfinished"/> + <translation>Skaler graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> - <translation type="unfinished"/> + <translation>Billeder fra/til</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> - <translation type="unfinished"/> + <translation>Tank tryk fra/til</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> - <translation type="unfinished"/> + <translation>&Filtrer dykliste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> + <translation>Vævs graf fra/til</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Print</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&Afslut</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Importer fra &dive computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Re-Nummerer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>&Editer device navne</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>&Tilføj dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Auto &grupering</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>&Årlig statistik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>&Dykker liste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Fo&rige DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Venstre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Højre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>&Manual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>&Planlæg dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>&Importer logfiler</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Importer dykkerlog fra andre programmer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Åben fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Fortryd</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Print runtime skema</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Gem ændringer?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Gem fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Åben log fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation>Dykker log filer (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran filer (*.can);;CSV files (*.csv);;DiveLog.de filer (*.dld);;JDiveLog filer (*.jlb);;Liquivision filer (*.lvd);;MkVI filer (*.txt);;Suunto filer (*.sde *.db);;UDDF/UDCF filer (*.uddf *.udcf);;XML filer (*.xml);;Alle filer (*)</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Årlig statistik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3336,8 +3469,48 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> + <translation>Filtrer visning %1(af %2) dyk</translation> + </message> +</context> +<context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> <translation type="unfinished"/> </message> </context> @@ -3399,387 +3572,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Standard</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Enheder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Graf</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Sprog</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Netværk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Font størrelse</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Dyk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Brug standard</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animationer</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Hastighed</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Nulstil alle indstillinger</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Sæt alle indstillinger til default værdier</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metrisk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personliggør</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>fod</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>System standard</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Proxy type</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Kræver godkendelse</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Brugernavn</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Password</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Tryk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Lister og tabeller</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Standard log fil</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Ugyldigt display</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Standard flaske</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Brug standard flaske</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface web service</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Standard bruger ID</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Gem bruger ID lokalt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volumen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Vægt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Tids enheder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minutter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Sekunder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Vis</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow på max dybde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Blandet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Indstillinger</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Op/Nedstignings hastigheds nævner</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Tærskel ved visning af pO2</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Tærskel ved visning af pN2</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Tærskel ved visning af pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Maks pO₂ ved visning af MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Tegn dykker computer rapporteret loft rødt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Vis ubrugte flasker i Udstyrs fanebladet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Vis gennemsnits dybde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHøj</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Ingen proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>System proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Genstart nødvendigt</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Valg af nyt sprog vil kræve en genstart af Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Hvis du klikker OK, vil alle indstillinger bliver set til deres standard værdier. Dette vil ske øjeblikkeligt. </translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Åben standard log fil</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -3906,72 +4094,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>Ukendt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Dyk #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Max dybde: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Varighed: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Brugt gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> - <translation type="unfinished"/> + <translation>Tags:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Vægt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Noter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Makker:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Dragt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Sigt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> @@ -3979,103 +4167,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 af %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> - <translation type="unfinished"/> + <translation>Vis NDL / TTS blev slået fra, da det tog for lang tid at danne den.</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Vælg som 1. dykkercomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Slet denne dykkercomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Tilføj gas skift</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> - <translation type="unfinished"/> + <translation>(Flaske %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> - <translation type="unfinished"/> + <translation>Tilføj set-point skift</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Tilføj bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Slet hændelse</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Skjul tilsvarende hændelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Vis alle hændelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Skjul hændelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hændelser?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Fjern de valgte hændelser?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Rediger bogmærke navn</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Brugerdefineret navn:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Navn er for langt!</translation> </message> @@ -4103,22 +4291,22 @@ p, li { white-space: pre-wrap; } <translation>Luk</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Maksimal</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Naviger på kortet og dobbelt klik for at sætte lokationen</translation> </message> @@ -4186,12 +4374,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kunne ikke lave en forbindelse til dykker computeren</translation> </message> @@ -4205,12 +4393,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Nyt start nummer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Nyt nummer</translation> </message> @@ -4218,12 +4406,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kunne ikke lave en forbindelse til dykker computeren</translation> </message> @@ -4246,7 +4434,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/setpoint.ui" line="43"/> <source>New set-point (0 for OC)</source> - <translation type="unfinished"/> + <translation>Nyt set-point (0 for OC)</translation> </message> <message> <location filename="../qt-ui/setpoint.ui" line="61"/> @@ -4302,12 +4490,12 @@ p, li { white-space: pre-wrap; } <translation>Hvilke dato/tid er vist på billedet?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Åben billede til</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Billede filer (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4357,6 +4545,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4380,8 +4682,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4424,7 +4726,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/> <source>Enter User ID and click Download</source> - <translation type="unfinished"/> + <translation>Indtast bruger ID og klik Download</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/> @@ -4435,7 +4737,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Dragte:</translation> </message> @@ -4451,11 +4753,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Tilføj flaske</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4465,9 +4762,9 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> - <translation type="unfinished"/> + <translation>Tags:</translation> </message> </context> <context> @@ -4509,60 +4806,80 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/models.cpp" line="1090"/> <source> (%1 shown)</source> - <translation type="unfinished"/> + <translation>(%1 vist)</translation> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Tjek for opdateringer</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface kunne ikke tjekke for opdateringer</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Følgende fejl opstod:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Tjek din internet forbindelse.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> - <translation type="unfinished"/> + <translation>Du anvender den nyeste version af Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> - <translation type="unfinished"/> + <translation>En ny version af Subsurface er tilgængelig.<br/>Klik på:<br/><a href="%1">%1</a><br/> for at downloade den.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> - <translation type="unfinished"/> + <translation>En ny version af Subsurface er tilgængelig.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> - <translation type="unfinished"/> + <translation>Nyeste version er %s, tjek venligst med din OS leverandør for opdateringer.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation>Nyeste udgave er</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Der opstod en fejl da der blev tjekket for opdateringer.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4582,64 +4899,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Vi vil meget gerne lære noget mere om brugerne af Subsurface. Du kan hjælpe ved at bruge et minut på at udfylde dette skema. </translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Bruger undersøgelse</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Subsurface bruger undersøgelse</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Sports dykker</translation> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Teknisk dykker</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Interesseret i dykkerplanlægning</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Jeg indlæser dyk fra understøttet dykkercomputer</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Jeg importerer dyk fra andre steder</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Jeg tilføjer dyk manuelt</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Jeg bruger Android Companion App til lokations bestemmelse</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Skriv venligt forslag (på engelsk) i den følgende boks</translation> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Efterstående information omkring dit system vil også blive sendt</translation> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4812,12 +5139,19 @@ OS CPU Arkitektur: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kunne ikke lave en forbindelse til dykker computeren</translation> </message> @@ -4825,79 +5159,79 @@ OS CPU Arkitektur: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>År >Måned / Tur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Varighed Ialt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Kortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Længst</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Dybde (%1) Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4913,13 +5247,13 @@ Gennemsnit</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4930,16 +5264,16 @@ Gennemsnit</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>fod</translation> </message> @@ -4965,120 +5299,120 @@ Gennemsnit</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>pund (lbs)</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>luft</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integreret</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>bælte</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>ankel</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>bagpladevægt</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>Clip-On</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Fejl i læsning af '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> - <translation type="unfinished"/> + <translation>Kan ikke åbne CSV fil %s; Brug venligst import log fil dialogen</translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon import fejlede: Kunne ikke læse '%s'</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> - <translation type="unfinished"/> + <translation>Mundstykke position OC</translation> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> - <translation type="unfinished"/> + <translation>Mundstykke position CC</translation> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> - <translation type="unfinished"/> + <translation>Mundstykke position ukendt</translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> - <translation type="unfinished"/> + <translation>Power off</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> - <translation type="unfinished"/> + <translation>O₂ kalibrering fejlede</translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> - <translation type="unfinished"/> + <translation>O₂ kalibrering</translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> - <translation type="unfinished"/> + <translation>Ingen DC passer til filen '%s'</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksimum antal kolonner i CSV import er %d</translation> </message> @@ -5097,7 +5431,7 @@ Gennemsnit</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation>batteri</translation> </message> @@ -5111,7 +5445,7 @@ Gennemsnit</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>opstigning</translation> @@ -5158,7 +5492,7 @@ Gennemsnit</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5314,42 +5648,42 @@ Gennemsnit</translation> <translation>Fejl i fortolkning af prøver</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Fejl: registering the event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Fejl: registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Import fejl i dykker data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Kan ikke danne libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Kan ikke åbne %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Utilstrækkelige privilegier til at åbne enheden %s %s (%s)</translation> </message> @@ -5368,222 +5702,254 @@ Gennemsnit</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Database forespørgsel get_events fejlede - </translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Database query get_tags failed. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Database forbindelse fejlede '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Database forespørgsel fejlede '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Database query get_cylinders failed. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. </source> - <translation>Database query get_changes failed. + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Database forbindelse fejlede '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Database query get_profile_sample failed. + <translation>Database forespørgsel fejlede '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åbne stylesheet %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Kan ikke finde gas %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>For mange gas blandinger</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>Baseret på GFlow = %d og GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurface dykker plan</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>dybde</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>varighed</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> - <translation type="unfinished"/> + <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> - <translation type="unfinished"/> + <translation>Skift gas til %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Skift gas til %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gas forbrug (CCR etaper udeladt)</translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Gas forbrug:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <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="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Ikke ekstra gas nok til deling ved opstigning</translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s i planlagt opstigning)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planlagt opstigning) af %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5593,7 +5959,7 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s @@ -5601,21 +5967,21 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min @@ -5623,42 +5989,42 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5667,7 +6033,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5676,158 +6042,164 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sikkerhedsstop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sikkerhedsstop: ukendt tid @ %.0f%s</translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: unkn time @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (calc)</translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>In deko (beregn)</translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (beregn)</translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (beregn)</translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Beregnet loft %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Væv %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>Hjertefrekvens: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>bærende: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s </translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dyk)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 dyk)</translation> </message> @@ -5992,97 +6364,97 @@ EADD: %d%s <translation>(ingen dyk)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Søn</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Man</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Tir</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Ons</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Tor</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Fre</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Lør</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Maj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -6134,12 +6506,12 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../uemis-downloader.c" line="454"/> <source>divespot #</source> - <translation type="unfinished"/> + <translation>Dykkersted #</translation> </message> <message> <location filename="../uemis-downloader.c" line="456"/> <source>details for #</source> - <translation type="unfinished"/> + <translation>Detaljer for #</translation> </message> <message> <location filename="../uemis-downloader.c" line="650"/> @@ -6254,27 +6626,27 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../uemis.c" line="218"/> <source>Tank change suggested</source> - <translation type="unfinished"/> + <translation>Flaske skift anbefalet</translation> </message> <message> <location filename="../uemis.c" line="220"/> <source>Depth limit exceeded</source> - <translation type="unfinished"/> + <translation>Dybde grænse overskredet</translation> </message> <message> <location filename="../uemis.c" line="222"/> <source>Max deco time warning</source> - <translation type="unfinished"/> + <translation>Advarsel - max deko tid</translation> </message> <message> <location filename="../uemis.c" line="224"/> <source>Dive time info</source> - <translation type="unfinished"/> + <translation>Dykker tid info</translation> </message> <message> <location filename="../uemis.c" line="226"/> <source>Dive time alert</source> - <translation type="unfinished"/> + <translation>Alarm, dykkertid</translation> </message> <message> <location filename="../uemis.c" line="228"/> @@ -6284,17 +6656,17 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../uemis.c" line="230"/> <source>No tank data</source> - <translation type="unfinished"/> + <translation>Ingen flaske data</translation> </message> <message> <location filename="../uemis.c" line="232"/> <source>Low battery warning</source> - <translation type="unfinished"/> + <translation>Advarsel, lav batteri</translation> </message> <message> <location filename="../uemis.c" line="234"/> <source>Low battery alert</source> - <translation type="unfinished"/> + <translation>Advarsel, lav batteri</translation> </message> <message> <location filename="../save-html.c" line="434"/> @@ -6306,7 +6678,7 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../save-html.c" line="452"/> <source>Number</source> - <translation type="unfinished"/> + <translation>Nummer</translation> </message> <message> <location filename="../save-html.c" line="453"/> @@ -6371,12 +6743,12 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../save-html.c" line="461"/> <source>Trips</source> - <translation type="unfinished"/> + <translation>Ture</translation> </message> <message> <location filename="../save-html.c" line="463"/> <source>Advanced search</source> - <translation type="unfinished"/> + <translation>Avanceret søgning </translation> </message> <message> <location filename="../save-html.c" line="469"/> @@ -6406,7 +6778,7 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../save-html.c" line="474"/> <source>Show more details</source> - <translation type="unfinished"/> + <translation>Vis flere detaljer</translation> </message> <message> <location filename="../save-html.c" line="477"/> @@ -6426,27 +6798,27 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../save-html.c" line="480"/> <source>Average time</source> - <translation type="unfinished"/> + <translation>Gennemsnits tid</translation> </message> <message> <location filename="../save-html.c" line="481"/> <source>Shortest time</source> - <translation type="unfinished"/> + <translation>Korteste tid</translation> </message> <message> <location filename="../save-html.c" line="482"/> <source>Longest time</source> - <translation type="unfinished"/> + <translation>Længste tid</translation> </message> <message> <location filename="../save-html.c" line="483"/> <source>Average depth</source> - <translation type="unfinished"/> + <translation>Gennemsnits dybde</translation> </message> <message> <location filename="../save-html.c" line="484"/> <source>Min. depth</source> - <translation type="unfinished"/> + <translation>Min. dybde</translation> </message> <message> <location filename="../save-html.c" line="485"/> @@ -6456,77 +6828,77 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../save-html.c" line="487"/> <source>Min. SAC</source> - <translation type="unfinished"/> + <translation>Min. SAC</translation> </message> <message> <location filename="../save-html.c" line="488"/> <source>Max. SAC</source> - <translation type="unfinished"/> + <translation>Max SAC.</translation> </message> <message> <location filename="../save-html.c" line="489"/> <source>Average temp.</source> - <translation type="unfinished"/> + <translation>Gennemsnits temp.</translation> </message> <message> <location filename="../save-html.c" line="490"/> <source>Min. temp.</source> - <translation type="unfinished"/> + <translation>Min. temp.</translation> </message> <message> <location filename="../save-html.c" line="491"/> <source>Max. temp.</source> - <translation type="unfinished"/> + <translation>Max. temp.</translation> </message> <message> <location filename="../save-html.c" line="492"/> <source>Back to list</source> - <translation type="unfinished"/> + <translation>Tilbage til listen</translation> </message> <message> <location filename="../save-html.c" line="498"/> <source>Dive equipment</source> - <translation type="unfinished"/> + <translation>Udstyr</translation> </message> <message> <location filename="../save-html.c" line="501"/> <source>Work pressure</source> - <translation type="unfinished"/> + <translation>Arbejdstryk</translation> </message> <message> <location filename="../save-html.c" line="502"/> <source>Start pressure</source> - <translation type="unfinished"/> + <translation>Start tryk</translation> </message> <message> <location filename="../save-html.c" line="503"/> <source>End pressure</source> - <translation type="unfinished"/> + <translation>Slut tryk</translation> </message> <message> <location filename="../save-html.c" line="511"/> <source>Dive status</source> - <translation type="unfinished"/> + <translation>Dykkerstatus</translation> </message> <message> <location filename="../save-html.c" line="486"/> <source>Average SAC</source> - <translation type="unfinished"/> + <translation>Gennemsnits SAC</translation> </message> <message> <location filename="../save-html.c" line="495"/> <source>Dive No.</source> - <translation type="unfinished"/> + <translation>Dyk nr.</translation> </message> <message> <location filename="../save-html.c" line="496"/> <source>Dive profile</source> - <translation type="unfinished"/> + <translation>Dykker profil</translation> </message> <message> <location filename="../save-html.c" line="497"/> <source>Dive information</source> - <translation type="unfinished"/> + <translation>Dyk information</translation> </message> <message> <location filename="../save-html.c" line="499"/> @@ -6552,12 +6924,12 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../save-html.c" line="507"/> <source>Events</source> - <translation type="unfinished"/> + <translation>Hændelser</translation> </message> <message> <location filename="../save-html.c" line="508"/> <source>Name</source> - <translation type="unfinished"/> + <translation>Navn</translation> </message> <message> <location filename="../save-html.c" line="509"/> @@ -6592,17 +6964,17 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../worldmap-save.c" line="43"/> <source>Max. depth:</source> - <translation type="unfinished"/> + <translation>Max. dybde</translation> </message> <message> <location filename="../worldmap-save.c" line="46"/> <source>Air temp.:</source> - <translation type="unfinished"/> + <translation>Luft temp.</translation> </message> <message> <location filename="../worldmap-save.c" line="48"/> <source>Water temp.:</source> - <translation type="unfinished"/> + <translation>Vand temp.</translation> </message> <message> <location filename="../worldmap-save.c" line="50"/> @@ -6770,7 +7142,7 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../qt-ui/plannerSettings.ui" line="528"/> <source>Verbatim dive plan</source> - <translation type="unfinished"/> + <translation>Trin for trin dykkerplan</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="387"/> @@ -6781,7 +7153,7 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <message> <location filename="../qt-ui/plannerSettings.ui" line="115"/> <source>75% to 50% avg. depth</source> - <translation type="unfinished"/> + <translation>75% til 50% gnm. dybde</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="132"/> diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index 75f4b9e53..27508589d 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Person: </translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>Sucht nach Buddies und Divemasters</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Sicherungsdatei %1 konnte nicht gespeichert werden. Fehlermeldung: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Sicherungsdatei konnte nicht geöffnet werden: %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation>Tauchcomputerdetails erfolgreich gelesen</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Einstellungen erfolgreich übertragen</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Geräte-Firmware erfolgreich aktualisiert</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Geräte-Einstellungen erfolgreich zurückgesetzt</translation> </message> @@ -847,72 +847,72 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Sicherungsdateien (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>Beim Speichern der Datensicherungsdatei ist ein Fehler aufgetreten. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Sicherung abgeschlossen</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>Ihre Einstellungen wurden gespeichert nach: %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation>Tauchcomputereinstellungen sichern</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation>XML-Sicherungsfehler</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation>Tauchcomputereinstellungen wiederherstellen</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation>XML-Wiederherstellungsfehler</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Beim Wiederherstellen der Datensicherungsdatei ist ein Fehler aufgetreten. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>Wiederherstellung abgeschlossen</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>Ihre Einstellungen wurden erfolgreich wiederhergestellt.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Firmwaredatei auswählen</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>Alle Dateien (*.*)</translation> </message> @@ -1070,22 +1070,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Gerätekennung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Gerätename</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Hier klicken entfernt diesen Tauchcomputer.</translation> </message> @@ -1093,18 +1093,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Notausstieg mit offenem System</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation> Anfang</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation> Ende</translation> @@ -1113,97 +1113,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Ort</translation> </message> @@ -1211,87 +1211,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Alle ausfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Alle einfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Andere einklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Entferne Tauchgäng(e) aus Reise</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Neue Reise darüber einfügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Tauchgäng(e) zur Reise darüber hinzufügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Tauchgäng(e) zur Reise darunter hinzufügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Reise mit der darüber verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Reise mit der darunter verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Tauchgäng(e) löschen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Tauchgäng(e) als ungültig markieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Tauchgänge neu nummerieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Zeiten verschieben</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Bilder laden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Öffne Bilddateien</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1299,54 +1299,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Export Format</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Weltkarte</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Auswahl</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Ausgewählte Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Alle Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1361,107 +1356,133 @@ <translation>Allgemeiner Export</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation>DiveShare</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation>Tiefe, in der das Bild aufgenommen wurde</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Allg. Einstellungen</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Subsurface Nummern</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation>Jährliche Statistiken exportieren</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Nur Liste exportieren</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Stiloptionen</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Schriftart</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Schriftgrösse</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Motiv</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Licht</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Sand</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF Dateien (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV Dateien (*.csv *.CSV)</translation> </message> @@ -1472,77 +1493,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Kommagetrennte Werte, welche die relevantesten Informationen des Tauchprofils enthalten.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Tauchdaten an die divelogs.de-Webseite senden.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation>Tauchdaten an die dive-share.appspot.com-Webseite senden</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML-Export der Tauchplätze, visualisiert auf einer Weltkarte.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Natives Subsurface XML-Format</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation>Tiefe, in der das Bild aufgenommen wurde, in die Datei schreiben</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>UDDF-Datei exportieren als</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>CSV-Datei exportieren als</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Weltkarte exportieren</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML Dateien (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Exportiere Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML Dateien (*.xml, *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation>Tiefe speichern, in der das Bild aufgenommen wurde</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>HTML-Datei exportieren als</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Kann Datei %s nicht öffnen</translation> </message> @@ -1581,7 +1608,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Zeit</translation> </message> @@ -1607,25 +1634,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Feldtrenner</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Einheiten</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metrisch</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Zöllig</translation> </message> @@ -1640,100 +1667,160 @@ <translation>Manuelle Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation>Bitte Reihenfolge von Tag, Monat und Jahr im Datumsformat wählen. Das Trennzeichen kann eines aus .-/ sein.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Datumsformat</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>tt.mm.jjjj</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation>mm/tt/jjjj</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation>jjjj-mm-tt</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Tauchgang Nr.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation>Datum als tt.mm.jjjj, jjjj-mm-tt oder mm/tt/jjjj</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation>Tauchgangsdauer in Sekunden oder als min:sec</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Stichwörter</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Ort</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Max. Tiefe</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Feldkonfiguration</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Mittlere Tiefe</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Notizen</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Gewicht</translation> </message> @@ -1845,77 +1932,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Zeit</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Druck</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Farbe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Druck S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation>Umgebungsdruck</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Druck I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Benutzer Eingabe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Flaschen Index</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Tiefster Deko-Stopp</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1966,127 +2068,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Ort</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2190,54 +2292,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Wiederholen</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Finde Uemis Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Wählen Sie die Datei zum Herunterladen der Tauchcomputer-Protokolldatei aus</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Protokolldateien (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Datei auswählen, in die der libdivecomputer Dump gespeichert werden soll</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Dump Dateien (*.bin)</translation> </message> @@ -2310,17 +2412,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Wert</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2359,17 +2486,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation>Firmware-Aktualisierung fehlgeschlagen!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation> </message> @@ -2377,7 +2504,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Ausgewählte Tauchplätze bearbeiten</translation> </message> @@ -2385,7 +2512,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Ort:</translation> </message> @@ -2401,330 +2528,330 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Ort</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Koordinaten</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Stichwörter</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Sicht</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Notizen</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Wassertemp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Notizen</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Ausrüstung</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Verw. Gase</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Max. Tiefe</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Luftdruck</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Gesamtzeit</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation>Zusatzdaten</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation>Zusätzliche Daten vom Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Zeit</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Informationen</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Oberflächenpause</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Ø Tiefe</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Salzgehalt</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Statistiken</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Flaschen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Blei</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation>Änderungen anwenden</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation>Änderungen Verwerfen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Flasche hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation>Gewicht hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Wassertemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Diese Reise wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Mehrere Tauchgänge werden bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Dieser Tauchgang wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Reisenotizen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Reiseort</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Tiefster Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Flachster Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation>Höchster gesamt SAC eines Tauchganges</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation>Niedrigster gesamt SAC eines Tauchganges</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation>Durchschnittlicher gesamt SAC aller ausgewählter Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation>Höchste Temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation>Niedrigste Temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation>Durchschnittstemperatur aller ausgewählten Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation>Längster Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation>Kürzester Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation>Durchschnittsdauer aller ausgewählten Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2733,17 +2860,17 @@ den folgenden Gasen gemischt werden: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>und</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Änderungen verwerfen?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Sie sind im Begriff, die Änderungen zu Verwerfen.</translation> </message> @@ -2751,92 +2878,92 @@ den folgenden Gasen gemischt werden: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&Datei</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation>Logbücher exportieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>pHe-Kurve ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Berechnung aller Gewebe ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Auftauchgrenze Tauchcomputer ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Berechnete Auftauchgrenze ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Nullzeit, Gesamtaufstiegszeit ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Berechnete Auftauchgrenze in 3m Schritten ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>&Tauchcomputer konfigurieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Tauchgang erneut planen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Pulsrate ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>MOD ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>SAC Rate ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Lineal ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Tauchplandetails</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Drucken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2849,486 +2976,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>Protoko&ll</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Ansicht</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Hilfe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Neues Logbuch</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Neu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>Logbuch &öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Speichern</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Speichern als</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Speichern unter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>Schliessen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Schliessen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>GPS-Daten vom Subsurface-Webdienst importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>Tau&chkomponenten kopieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>Tauchkom&ponenten einfügen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>Informationen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>Alle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>Nächster TC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>Info zu Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>Globus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>&Von divelogs.de importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>Vollbild</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Vollbild Umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>Nach neuer Version suchen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>Exportiere</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Strg+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation>pO₂-Plot umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation>pN₂-Plot umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Massstabsgraph</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation>Bilder umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation>Tankleiste umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>Liste der Tauchgänge filtern</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation>Gewebe-Sättigungskurve ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Drucken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&Beenden</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Von &Tauchcomputer importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Neu nummerieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>Gerätenamen bearbeiten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>Tauchgang hinzufügen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Automatisch &gruppieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>Tauchgangliste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Vorh. TC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Links</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Rechts</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>Benutzerhandbuch</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>Tauchgang planen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>Protokolldateien &importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Tauchprotokolldateien von anderen Anwendungen importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Laufzeittabelle anzeigen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Tauchprotokolldatei öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation>Tauchprotokolldateien (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran-Dateien (*.can);;CSV-Dateien (*.csv);;DiveLog.de-Dateien (*.dld);;JDiveLog-Dateien (*.jlb);;Liquivision-Dateien (*.lvd);;MkVI files (*.txt);;Suunto-Dateien (*.sde *.db);;UDDF/UDCF-Dateien (*.uddf *.udcf);;XML-Dateien (*.xml);;Alle Dateien (*)</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3336,12 +3468,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter zeigt %1 (von %2) Tauchgängen</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3399,387 +3571,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Standardeinstellungen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Einheiten</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Diagramm</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Sprache</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Netzwerk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Schriftart</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Schriftgrösse</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Standardeinstellungen verwenden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animationen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Geschwindigkeit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Alle Einstellungen zurücksetzen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Alle Einstellungen auf Standardwert setzen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metrisch</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Zöllig</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personalisieren</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>Meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>Fuss</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>Liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>Celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>Fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Standardeinstellungen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Proxy-Typ</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Anmeldung erforderlich</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Benutzername</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Passwort</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Druck</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Listen und Tabellen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Standard-Tauchprotokolldatei</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Ungültige anzeigen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Standardflasche</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Standardflasche verwenden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface-Webdienst</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Standard-Benutzerkennung</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Benutzerkennung lokal speichern?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volumen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>US-Pfund</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Zeiteinheiten</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minuten</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Sekunden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Anzeigen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GF niedrig bei maximaler Tiefe anwenden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Sonstiges</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Schwellenwert bei pO₂ Anzeige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Schwellenwert bei pN₂ Anzeige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Schwellenwert bei pHe Anzeige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>max pO₂ bei MOD Anzeige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Zeichne Auftauchgrenze des Tauchcomputers in rot</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Durchschnittstiefe anzeigen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GF niedrig</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GF hoch</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Kein Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Systemproxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Bitte Programm neu starten</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Mit OK werden alle Einstellungen zurückgesetzt. Dies hat sofortige Wirkung.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Standard-Protokolldatei öffnen</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Warnung</translation> </message> @@ -3906,72 +4093,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Tauchgang Nr. %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>max Tiefe: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Dauer: %1 Minuten</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Verw. Gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Stichwörter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Blei:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Notizen:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Sicht:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> @@ -3979,103 +4166,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 von %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Primärer Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Lösche diesen Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation>Set-Point-Wechsel hinzufügen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Markierung setzen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Entferne Ereignis</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Ähnliche Ereignisse ausblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Name bearbeiten</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <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="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Alle Ereignisse einblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Ereignisse ausblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Alle %1 Ereignisse ausblenden?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Ausgewähltes Ereignis entfernen?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Name der Markierung bearbeiten</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Benutzerdefinierter Name:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Der Name ist zu lang!</translation> </message> @@ -4103,22 +4290,22 @@ p, li { white-space: pre-wrap; } <translation>Schliessen</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Ø</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Min.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Max.</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation> </message> @@ -4186,12 +4373,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation> </message> @@ -4205,12 +4392,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Neue erste Nummer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Neue Nummer</translation> </message> @@ -4218,12 +4405,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation> </message> @@ -4302,12 +4489,12 @@ p, li { white-space: pre-wrap; } <translation>Welche/s Datum/Zeit werden im Bild angezeigt?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Öffne Bilddatei</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4357,6 +4544,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4380,8 +4681,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Plattformunabhängige Tauchprotokoll-Software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, und andere, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4435,7 +4736,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Anzug:</translation> </message> @@ -4451,11 +4752,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Flasche hinzufügen</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4465,7 +4761,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Stichwörter: </translation> </message> @@ -4515,54 +4811,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Neue Version suchen</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface konnte nicht nach neuen Versionen suchen.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Fehlermeldung erhalten:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Bitte Überprüfen Sie Ihre Internetverbindung.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation>Dies ist die neuste Subsurfaceversion.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Es gibt eine neue Subsurface-Version.<br/>Klick hier:<br/><a href="%1">%1</a><br/> zum Download.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation>Es gibt eine neue Version von Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation>Die aktuellste Version ist %1, bitte den Betriebssystem Hersteller kontaktieren.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> - <translation>Die letzte freigegebene Version ist</translation> + <translation>Die letzte freigegebene Version ist </translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Während der Suche nach einer neuen Version ist ein Fehler aufgetreten.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4582,64 +4898,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Wir würden gerne mehr über unsere Benutzer, ihre Präferenzen und die Art der Benutzung dieser Software erfahren. Bitte nimm Dir eine Minute Zeit, um diese Umfrage auszufüllen und sie dem Subsurface Team zu schicken. Bitte wähle alle zutreffenden Auswahlmöglichkeiten aus.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Benutzerumfrage</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Subsurface Benutzerumfrage</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Sporttaucher</translation> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Tec-Taucher</translation> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Interessiert an Tauchgangsplanung</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Ich lade Tauchgänge vom unterstützten Tauchcomputer</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Ich importiere Tauchgänge aus anderer Software / Quellen</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Ich gebe Tauchgänge manuell ein</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Ich benutze die Android App, um Tauchplätze zu verfolgen</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Verbesserungsvorschläge (bevorzugt auf Englisch):</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Die folgenden Systeminformationen werden ebenfalls übertragen</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4812,12 +5138,19 @@ Prozessor Architektur (laut Betriebsystem): %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation> </message> @@ -4825,79 +5158,79 @@ Prozessor Architektur (laut Betriebsystem): %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Jahr > Monat / Reise</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Dauer Gesamt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Ø</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Kürzester</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Längster</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Tiefe (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4913,13 +5246,13 @@ Durchschnitt</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4930,16 +5263,16 @@ Durchschnitt</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4965,120 +5298,120 @@ Durchschnitt</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>Luft</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integriert</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>Gürtel</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>Fussblei</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>Backplate-Gewicht</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>Kann CSV-Datei %s nicht öffnen; bitte verwenden Sie den Dialog Protokolldatei importieren</translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon-Import fehlgeschlagen: kann '%s' nicht lesen</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation>Mundstücksposition offenes System</translation> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation>Mundstücksposition geschlossenes System</translation> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation>Mundstücksposition unbekannt</translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation>Mundstücksposition nicht angeschlossen</translation> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation>Ausschalten</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation>O₂-Kalibrierung fehlgeschlagen</translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation>O₂-Kalibrierung</translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation>Kein zugehöriger Tauchcomputer für die Datei '%s' gefunden</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation> </message> @@ -5097,7 +5430,7 @@ Durchschnitt</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation>Batterie</translation> </message> @@ -5111,7 +5444,7 @@ Durchschnitt</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>Aufstieg</translation> @@ -5158,7 +5491,7 @@ Durchschnitt</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5314,42 +5647,42 @@ Durchschnitt</translation> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Unzureichende Privilegien zum Öffnen von Gerät %s %s (%s)</translation> </message> @@ -5368,222 +5701,254 @@ Durchschnitt</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Datenbank Anfrage 'get_events' fehlgeschlagen. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Datenbank Anfrage 'get_tags' fehlgeschlagen. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Datenbank Verbindung fehlgeschlagen '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Datenbank Anfrage fehlgeschlagen '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Datenbank Anfrage 'get_cylinders' fehlgeschlagen. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. </source> - <translation>Datenbank Anfrage 'get_changes' fehlgeschlagen. + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Datenbank Verbindung fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Datenbank Anfrage 'get_profile_sample' fehlgeschlagen. + <translation>Datenbank Anfrage fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Kann Gas %s nicht finden</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Zu viele Gasgemische</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>basierend auf GF niedrig = %d und GF hoch = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurface Tauchplan</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>Gas</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <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="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <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="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Wechsle Gas auf %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Gaswechsel zu %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gasverbrauch (ohne CCR Segmente):</translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Gasverbrauch:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Warnung:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>HAFTUNGSAUSSCHLUSS / WARNUNG: DIES IST EINE NEUE IMPLEMENTATION DES BÜHLMANN-ALGORITHMUS UND EINES DARAUF BASIERENDEN TAUCHPLANERS, DIE NUR EINGESCHRÄNKT GETESTET WURDE. WIR RATEN DRINGENST, KEINE TAUCHGÄNGE DURCHZUFÜHREN, DIE NUR AUF DEN HIER ERSTELLTEN DATEN BERUHEN.</translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <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="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Keine ausreichende Reserve für Aufstieg unter Wechselatmung!</translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s im berechneten Aufstieg)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s im berechneten Aufstiegs) von %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5592,70 +5957,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5664,7 +6029,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5673,162 +6038,168 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sicherheitsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>In Deko </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>Nullzeit: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>Gesamtaufstiegszeit: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>Deko (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>Nullzeit: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>Gesamtaufstiegszeit: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Berechneter tiefster Deko-Stopp %.0f %s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Gewebe %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>Herzschlag: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>Peilung: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sTiefe:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sTiefe:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sDruck:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 Tauchgänge)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 Tauchgang)</translation> </message> @@ -5993,97 +6364,97 @@ EADD: %d%s <translation>(keine Tauchgänge)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>So</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Mo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Di</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Mi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Do</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Fr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Sa</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mär</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Dez</translation> </message> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index cac1fae9e..6368f30a2 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Person: </translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>Sucht nach Tauchgruppenleiter und Tauchpartner</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Sicherungsdatei %1 konnte nicht gespeichert werden. Fehlermeldung: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Sicherungsdatei konnte nicht geöffnet werden: %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation>Tauchcomputerdetails erfolgreich gelesen</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Einstellungen erfolgreich übertragen</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Geräte-Firmware erfolgreich aktualisiert</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Geräte-Einstellungen erfolgreich zurückgesetzt</translation> </message> @@ -847,72 +847,72 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Sicherungsdateien (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>Beim Speichern der Datensicherungsdatei ist ein Fehler aufgetreten. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Sicherung abgeschlossen</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>Ihre Einstellungen wurden gespeichert nach: %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation>Tauchcomputereinstellungen sichern</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation>XML-Sicherungsfehler</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation>Tauchcomputereinstellungen wiederherstellen</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation>XML-Wiederherstellungsfehler</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Beim Wiederherstellen der Datensicherungsdatei ist ein Fehler aufgetreten. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>Wiederherstellung abgeschlossen</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>Ihre Einstellungen wurden erfolgreich wiederhergestellt.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Firmwaredatei auswählen</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>Alle Dateien (*.*)</translation> </message> @@ -1070,22 +1070,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Gerätekennung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Gerätename</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Hier klicken entfernt diesen Tauchcomputer.</translation> </message> @@ -1093,18 +1093,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Notausstieg mit offenem System</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation> Anfang</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation> Ende</translation> @@ -1113,97 +1113,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>AMV(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Ort</translation> </message> @@ -1211,87 +1211,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Alle ausfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Alle einfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Andere einklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Entferne Tauchgäng(e) aus Reise</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Neue Reise darüber einfügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Tauchgäng(e) zur Reise darüber hinzufügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Tauchgäng(e) zur Reise darunter hinzufügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Reise mit der darüber verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Reise mit der darunter verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Tauchgäng(e) löschen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Tauchgäng(e) als ungültig markieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Tauchgänge neu nummerieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Zeiten verschieben</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Bilder laden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Öffne Bilddateien</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1299,54 +1299,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Export Format</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Weltkarte</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Auswahl</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Ausgewählte Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Alle Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1361,107 +1356,133 @@ <translation>Allgemeiner Export</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation>DiveShare</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation>Tiefe, in der das Bild aufgenommen wurde</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Allg. Einstellungen</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Subsurface Nummern</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation>Jährliche Statistiken exportieren</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Nur Liste exportieren</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Stiloptionen</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Schriftart</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Schriftgröße</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Motiv</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Licht</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Sand</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF Dateien (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV Dateien (*.csv *.CSV)</translation> </message> @@ -1472,77 +1493,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Kommagetrennte Werte, welche die relevantesten Informationen des Tauchprofils enthalten.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Tauchdaten an die divelogs.de-Webseite senden.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation>Tauchdaten an die dive-share.appspot.com-Webseite senden</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML-Export der Tauchplätze, visualisiert auf einer Weltkarte.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Natives Subsurface XML-Format</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation>Tiefe, in der das Bild aufgenommen wurde, in die Datei schreiben</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>UDDF-Datei exportieren als</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>CSV-Datei exportieren als</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Weltkarte exportieren</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML Dateien (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Exportiere Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML Dateien (*.xml, *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation>Tiefe speichern, in der das Bild aufgenommen wurde</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>HTML-Datei exportieren als</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Kann Datei %s nicht öffnen</translation> </message> @@ -1581,7 +1608,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Zeit</translation> </message> @@ -1607,25 +1634,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Feldtrenner</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Einheiten</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metrisch</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Zöllig</translation> </message> @@ -1640,100 +1667,160 @@ <translation>Manuelle Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation>Bitte Reihenfolge von Tag, Monat und Jahr im Datumsformat wählen. Das Trennzeichen kann eines aus .-/ sein.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Datumsformat</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>tt.mm.jjjj</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation>mm/tt/jjjj</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation>jjjj-mm-tt</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Tauchgang Nr.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation>Datum als tt.mm.jjjj, jjjj-mm-tt oder mm/tt/jjjj</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation>Tauchgangsdauer in Sekunden oder als min:sec</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Stichwörter</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Ort</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Max. Tiefe</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Feldkonfiguration</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Mittlere Tiefe</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Tauchpartner</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Notizen</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Gewicht</translation> </message> @@ -1845,77 +1932,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Zeit</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Druck</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Farbe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Druck S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation>Umgebungsdruck</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Druck I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Benutzer Eingabe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Flaschen Index</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Tiefster Deko-Stopp</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>AMV</translation> </message> @@ -1966,127 +2068,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>AMV</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>AMV(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Ort</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2190,54 +2292,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Wiederholen</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Finde Uemis Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Wählen Sie die Datei zum Herunterladen der Tauchcomputer-Protokolldatei aus</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Protokolldateien (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Datei auswählen, in die der libdivecomputer Dump gespeichert werden soll</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Dump Dateien (*.bin)</translation> </message> @@ -2310,17 +2412,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Wert</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2359,17 +2486,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation>Firmware-Aktualisierung fehlgeschlagen!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation> </message> @@ -2377,7 +2504,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Ausgewählte Tauchplätze bearbeiten</translation> </message> @@ -2385,7 +2512,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Ort:</translation> </message> @@ -2401,330 +2528,330 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Ort</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Koordinaten</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Tauchgruppenleiter</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Tauchpartner</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Stichwörter</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Sicht</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Notizen</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Wassertemp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Notizen</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Ausrüstung</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Verw. Gase</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CND</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Max. Tiefe</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Luftdruck</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Gesamtzeit</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation>Zusatzdaten</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation>Zusätzliche Daten vom Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Zeit</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Informationen</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Oberflächenpause</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>AMV</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Ø Tiefe</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Salzgehalt</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Statistiken</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Flaschen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Blei</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation>Änderungen anwenden</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation>Änderungen Verwerfen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Flasche hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation>Gewicht hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Wassertemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Diese Reise wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Mehrere Tauchgänge werden bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Dieser Tauchgang wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Reisenotizen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Reiseort</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Tiefster Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Flachster Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation>Höchster gesamt SAC eines Tauchganges</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation>Niedrigster gesamt SAC eines Tauchganges</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation>Durchschnittlicher gesamt SAC aller ausgewählter Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation>Höchste Temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation>Niedrigste Temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation>Durchschnittstemperatur aller ausgewählten Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation>Längster Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation>Kürzester Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation>Durchschnittsdauer aller ausgewählten Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2733,17 +2860,17 @@ den folgenden Gasen gemischt werden: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>und</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Änderungen verwerfen?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Sie sind im Begriff, die Änderungen zu Verwerfen.</translation> </message> @@ -2751,92 +2878,92 @@ den folgenden Gasen gemischt werden: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&Datei</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation>Logbücher exportieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>pHe-Kurve ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Berechnung aller Gewebe ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Auftauchgrenze Tauchcomputer ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Berechnete Auftauchgrenze ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Nullzeit, Gesamtaufstiegszeit ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Berechnete Auftauchgrenze in 3m Schritten ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>&Tauchcomputer konfigurieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Tauchgang erneut planen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Pulsrate ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>MOD ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>AMV-Rate ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Lineal ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Tauchplandetails</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Drucken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2849,486 +2976,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> - <translation>Protoko&ll</translation> + <translation>&Logbuch</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Ansicht</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Hilfe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Neues Logbuch</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Neu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Strg+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>Logbuch &öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Strg+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Speichern</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Strg+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Speichern als</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Speichern unter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Strg+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>Schließen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Schliessen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Strg+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>GPS-Daten vom Subsurface-Webdienst importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>Tau&chkomponenten kopieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Strg+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>Tauchkom&ponenten einfügen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Strg+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>Informationen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>Alle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>Nächster TC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>Info zu Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>Globus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Strg+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>&Von divelogs.de importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>Vollbild</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Vollbild Umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>Nach neuer Version suchen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>Exportiere</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Strg+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Strg+Umschalt+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation>pO₂-Plot umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation>pN₂-Plot umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Maßstabsgraph</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation>Bilder umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation>Tankleiste umschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>Liste der Tauchgänge filtern</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation>Gewebe-Sättigungskurve ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Strg+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Drucken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Strg+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&Beenden</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Von &Tauchcomputer importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Strg+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Strg++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Neu nummerieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Strg+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Strg+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Strg+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Strg+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Strg+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Strg+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>Gerätenamen bearbeiten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>Tauchgang hinzufügen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Automatisch &gruppieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>Tauchgangliste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Strg+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Strg+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Strg+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Strg+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Vorh. TC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Links</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Rechts</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>Benutzerhandbuch</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Strg+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>Tauchgang planen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>Protokolldateien &importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Tauchprotokolldateien von anderen Anwendungen importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Laufzeittabelle anzeigen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Tauchprotokolldatei öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation>Tauchprotokolldateien (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran-Dateien (*.can);;CSV-Dateien (*.csv);;DiveLog.de-Dateien (*.dld);;JDiveLog-Dateien (*.jlb);;Liquivision-Dateien (*.lvd);;MkVI files (*.txt);;Suunto-Dateien (*.sde *.db);;UDDF/UDCF-Dateien (*.uddf *.udcf);;XML-Dateien (*.xml);;Alle Dateien (*)</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3336,12 +3468,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter zeigt %1 (von %2) Tauchgängen</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3399,387 +3571,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Standardeinstellungen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Einheiten</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Diagramm</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Sprache</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Netzwerk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Schriftart</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Schriftgrösse</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Standardeinstellungen verwenden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animationen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Geschwindigkeit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Alle Einstellungen zurücksetzen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Alle Einstellungen auf Standardwert setzen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metrisch</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Zöllig</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personalisieren</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>Meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>Fuß</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>Liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>Celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>Fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Standardeinstellungen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Proxy-Typ</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Anmeldung erforderlich</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Benutzername</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Passwort</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Druck</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Listen und Tabellen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Standard-Tauchprotokolldatei</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Ungültige anzeigen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Standardflasche</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Standardflasche verwenden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface-Webdienst</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Standard-Benutzerkennung</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Benutzerkennung lokal speichern?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volumen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>US-Pfund</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Zeiteinheiten</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minuten</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Sekunden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Anzeigen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GF niedrig bei maximaler Tiefe anwenden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Sonstiges</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Schwellenwert bei pO₂ Anzeige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Schwellenwert bei pN₂ Anzeige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Schwellenwert bei pHe Anzeige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>max pO₂ bei MOD Anzeige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Zeichne Auftauchgrenze des Tauchcomputers in rot</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Durchschnittstiefe anzeigen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GF niedrig</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GF hoch</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Kein Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Systemproxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Bitte Programm neu starten</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Mit OK werden alle Einstellungen zurückgesetzt. Dies hat sofortige Wirkung.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Standard-Protokolldatei öffnen</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Warnung</translation> </message> @@ -3906,72 +4093,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Tauchgang Nr. %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>max Tiefe: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Dauer: %1 Minuten</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Verw. Gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Stichwörter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>AMV:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Blei:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Notizen:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Tauchpartner:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Sicht:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> @@ -3979,103 +4166,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 von %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Primärer Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Lösche diesen Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation>Set-Point-Wechsel hinzufügen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Markierung setzen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Entferne Ereignis</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Ähnliche Ereignisse ausblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Name bearbeiten</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <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="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Alle Ereignisse einblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Ereignisse ausblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Alle %1 Ereignisse ausblenden?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Ausgewähltes Ereignis entfernen?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Name der Markierung bearbeiten</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Benutzerdefinierter Name:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Der Name ist zu lang!</translation> </message> @@ -4103,22 +4290,22 @@ p, li { white-space: pre-wrap; } <translation>Schliessen</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Ø</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Min.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Max.</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation> </message> @@ -4186,12 +4373,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation> </message> @@ -4205,12 +4392,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Neue erste Nummer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Neue Nummer</translation> </message> @@ -4218,12 +4405,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation> </message> @@ -4302,12 +4489,12 @@ p, li { white-space: pre-wrap; } <translation>Welche/s Datum/Zeit werden im Bild angezeigt?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Öffne Bilddatei</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4357,6 +4544,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4380,8 +4681,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Plattformunabhängige Tauchprotokoll-Software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, und andere, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4435,7 +4736,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Anzug:</translation> </message> @@ -4451,11 +4752,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Flasche hinzufügen</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4465,7 +4761,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Stichwörter: </translation> </message> @@ -4515,54 +4811,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Neue Version suchen</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface konnte nicht nach neuen Versionen suchen.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Fehlermeldung erhalten:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Bitte Überprüfen Sie Ihre Internetverbindung.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation>Dies ist die neuste Subsurfaceversion.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Es gibt eine neue Subsurface-Version.<br/>Klick hier:<br/><a href="%1">%1</a><br/> zum Download.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation>Es gibt eine neue Version von Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation>Die aktuellste Version ist %1, bitte den Betriebssystem Hersteller kontaktieren.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> - <translation>Die letzte freigegebene Version ist</translation> + <translation>Die letzte freigegebene Version ist </translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Während der Suche nach einer neuen Version ist ein Fehler aufgetreten.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4582,64 +4898,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Wir würden gerne mehr über unsere Benutzer, ihre Präferenzen und die Art der Benutzung dieser Software erfahren. Bitte nimm Dir eine Minute Zeit, um diese Umfrage auszufüllen und sie dem Subsurface Team zu schicken. Bitte wähle alle zutreffenden Auswahlmöglichkeiten aus.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Benutzerumfrage</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Subsurface Benutzerumfrage</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Sporttaucher</translation> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Tec-Taucher</translation> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Interessiert an Tauchgangsplanung</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Ich lade Tauchgänge vom unterstützten Tauchcomputer</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Ich importiere Tauchgänge aus anderer Software / Quellen</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Ich gebe Tauchgänge manuell ein</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Ich benutze die Android App, um Tauchplätze zu verfolgen</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Verbesserungsvorschläge (bevorzugt auf Englisch):</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Die folgenden Systeminformationen werden ebenfalls übertragen</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4812,12 +5138,19 @@ Prozessor Architektur (laut Betriebsystem): %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation> </message> @@ -4825,79 +5158,79 @@ Prozessor Architektur (laut Betriebsystem): %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Jahr > Monat / Reise</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Dauer Gesamt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Ø</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Kürzester</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Längster</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Tiefe (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>AMV (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4913,13 +5246,13 @@ Durchschnitt</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4930,16 +5263,16 @@ Durchschnitt</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4965,120 +5298,120 @@ Durchschnitt</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>Luft</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integriert</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>Gürtel</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>Fussblei</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>Backplate-Gewicht</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>Kann CSV-Datei %s nicht öffnen; bitte verwenden Sie den Dialog Protokolldatei importieren</translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon-Import fehlgeschlagen: kann '%s' nicht lesen</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation>Mundstücksposition offenes System</translation> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation>Mundstücksposition geschlossenes System</translation> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation>Mundstücksposition unbekannt</translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation>Mundstücksposition nicht angeschlossen</translation> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation>Ausschalten</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation>O₂-Kalibrierung fehlgeschlagen</translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation>O₂-Kalibrierung</translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation>Kein zugehöriger Tauchcomputer für die Datei '%s' gefunden</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation> </message> @@ -5097,7 +5430,7 @@ Durchschnitt</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation>Batterie</translation> </message> @@ -5111,7 +5444,7 @@ Durchschnitt</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>Aufstieg</translation> @@ -5158,7 +5491,7 @@ Durchschnitt</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5314,42 +5647,42 @@ Durchschnitt</translation> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Unzureichende Privilegien zum Öffnen von Gerät %s %s (%s)</translation> </message> @@ -5368,222 +5701,254 @@ Durchschnitt</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Datenbank Anfrage 'get_events' fehlgeschlagen. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Datenbank Anfrage 'get_tags' fehlgeschlagen. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Datenbank Verbindung fehlgeschlagen '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Datenbank Anfrage fehlgeschlagen '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Datenbank Anfrage 'get_cylinders' fehlgeschlagen. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. </source> - <translation>Datenbank Anfrage 'get_changes' fehlgeschlagen. + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Datenbank Verbindung fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Datenbank Anfrage 'get_profile_sample' fehlgeschlagen. + <translation>Datenbank Anfrage fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Kann Gas %s nicht finden</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Zu viele Gasgemische</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>basierend auf GF niedrig = %d und GF hoch = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurface Tauchplan</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>Gas</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <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="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <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="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Wechsle Gas auf %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Gaswechsel zu %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CND</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gasverbrauch (ohne CCR Segmente):</translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Gasverbrauch:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Warnung:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>HAFTUNGSAUSSCHLUSS / WARNUNG: DIES IST EINE NEUE IMPLEMENTATION DES BÜHLMANN-ALGORITHMUS UND EINES DARAUF BASIERENDEN TAUCHPLANERS, DIE NUR EINGESCHRÄNKT GETESTET WURDE. WIR RATEN DRINGENST, KEINE TAUCHGÄNGE DURCHZUFÜHREN, DIE NUR AUF DEN HIER ERSTELLTEN DATEN BERUHEN.</translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <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="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Keine ausreichende Reserve für Aufstieg unter Wechselatmung!</translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s im berechneten Aufstieg)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s im berechneten Aufstiegs) von %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5592,70 +5957,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>AMV: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5664,7 +6029,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5673,162 +6038,168 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sicherheitsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>In Deko </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>Nullzeit: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>Gesamtaufstiegszeit: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>Deko (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>Nullzeit: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>Gesamtaufstiegszeit: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Berechneter tiefster Deko-Stopp %.0f %s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Gewebe %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>Herzschlag: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>Peilung: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sTiefe:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sTiefe:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sDruck:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 Tauchgänge)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 Tauchgang)</translation> </message> @@ -5993,97 +6364,97 @@ EADD: %d%s <translation>(keine Tauchgänge)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>So</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Mo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Di</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Mi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Do</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Fr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Sa</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mär</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Dez</translation> </message> diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts index cb321c9f8..6e831ef50 100644 --- a/translations/subsurface_el_GR.ts +++ b/translations/subsurface_el_GR.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1069,22 +1069,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Μοντέλο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>ID Συσκευής</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Όνομα</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"/> </message> @@ -1092,18 +1092,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Bailing out σε ανοικτό κύκλωμα</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>έναρξη</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>λήξη</translation> @@ -1112,97 +1112,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Ημερομηνία</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Βαθμός</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Στολή</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> @@ -1210,87 +1210,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1298,54 +1298,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation type="unfinished"/> </message> @@ -1360,107 +1355,133 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Γραμματοσειρά</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Μέγεθος Γραμματοσειράς</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF αρχεία (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation type="unfinished"/> </message> @@ -1471,77 +1492,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> + <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> - <source>Send the dive data to divelogs.de website.</source> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> - <source>Send the dive data to dive-share.appspot.com website</source> + <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> - <source>HTML export of the dive locations, visualized on a world map.</source> + <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> - <source>Subsurface native XML format.</source> + <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <source>Subsurface native XML format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> @@ -1580,7 +1607,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Ώρα</translation> </message> @@ -1606,25 +1633,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Μονάδες Μέτρησης</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Μετρικό</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperial</translation> </message> @@ -1639,100 +1666,160 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Ημερομηνία</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Ετικέτες</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Μέγιστο βάθος</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Ενδιάμεσο βάθος</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Ζευγάρι</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Σημειώσεις</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Βάρος</translation> </message> @@ -1844,77 +1931,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Βάθος</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Ώρα</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Πίεση</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Θερμοκρασία</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Χρώμα</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1965,127 +2067,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Ημερομηνία</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Βαθμός</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Βάθος</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Θερμοκρασία</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Βάρος</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Στολή</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2189,54 +2291,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>ΟΚ</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Σφάλμα</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Επανάληψη</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Επιλέξτε το αρχείο για το logfile της λήψης από τον υπολογιστή κατάδυσης</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Log files (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Προειδοποίηση</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Saving the libdivecomputer dump will NOT download dives to the dive list.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Επιλέξτε αρχείο για το binary dump file του υπολογιστή κατάδυσης</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Dump files (*.bin)</translation> </message> @@ -2309,17 +2411,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2358,17 +2485,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2376,7 +2503,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation type="unfinished"/> </message> @@ -2384,7 +2511,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2400,347 +2527,347 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Συντεταγμένες</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Ζευγάρι</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Ετικέτες</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Βαθμός</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Ορατότητα</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Στολή</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Σημειώσεις</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Εξοπλισμός</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Ημερομηνία</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Ώρα</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Διάλειμμα</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Αλμυρότητα</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Στατιστικά</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Βάθος</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Θερμοκρασία</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Καταδύσεις</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Φιάλες</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Βάρη</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Το ταξίδι αυτό επεξεργάζεται αυτή τη στιγμή.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Πολλαπλές καταδύσεις επεξεργάζονται αυτή τη στιγμή.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Η κατάδυση επεξεργάζεται αυτή τη στιγμή.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2748,92 +2875,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&File</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Εκτύπωση</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2842,486 +2969,491 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&View</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&New logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Νέο</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Open logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Άνοιγμα</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Save</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Αποθήκευση</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Αποθήκευση ως...</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>Έ&ξοδος</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Κλείσιμο</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>Εκτύ&πωση</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>Έ&ξοδος</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Εισαγωγή από &υπολογιστή κατάδυσης</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>Επ&αναρίθμηση</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Αριστερά</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Δεξιά</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν κλέισετε το αρχείο.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν προσπαθήσετε να προσθέσετε μια κατάδυση.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <source>Changes will be lost if you don't save them.</source> <translation>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Προειδοποίηση</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν ανοίξετε ένα νέο αρχείο.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3329,12 +3461,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3392,387 +3564,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Προεπιλογές</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Μονάδες Μέτρησης</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Γράφημα</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Γλώσσα</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Γραμματοσειρά</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Μέγεθος Γραμματοσειράς</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Καταδύσεις</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Σύστημα</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Μετρικό</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Προσαρμογή</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Βάθος</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>μέτρα</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>πόδια</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>λίτρα</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Κωδικός</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Φίλτρο</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Πίεση</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Όγκος</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Θερμοκρασία</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Βάρος</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Μονάδες Μέτρησης Χρόνου</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Λεπτά (min)</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Δευτερόλεπτα (sec)</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Εμφάνιση</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFlow στο μέγιστο βάθος</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Διάφορα</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Προτιμήσεις</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Απαιτείται επανεκκίνηση</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Για να φορτώσε σωστά μια γλώσσα πρέπει να επανεκκινήσεσε το Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Προειδοποίηση</translation> </message> @@ -3899,72 +4086,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>άγνωστο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Κατάδυση #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Μέγιστο Βάθος: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Διάρκεια: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Βάρη:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Σημειώσεις:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Ζευγάρι:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Στολή:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Ορατότητα:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Βαθμός:</translation> </message> @@ -3972,103 +4159,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Απόκρυψη παρόμοιων συμβάντων</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Απόκρυψη όλων των συμβάντων</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Απόκρυψη όλων των συμβάντων</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Απόκρυψη όλων των %1 συμβάντων;</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Διαγραφή του επιλεγμένου συμβάντος;</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4096,22 +4283,22 @@ p, li { white-space: pre-wrap; } <translation>Κλείσιμο</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Μέσος όρος</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Ελάχιστο</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Μέγιστο</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Μετακινήστε τον χάρτη και με διπλό κλικ ορίστε την τοποθεσία κατάδυσης</translation> </message> @@ -4179,12 +4366,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4198,12 +4385,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Νέος αρχικός αριθμός</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4211,12 +4398,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4295,12 +4482,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -4350,6 +4537,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4373,7 +4674,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> <translation type="unfinished"/> </message> </context> @@ -4428,7 +4729,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -4444,11 +4745,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4458,7 +4754,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4508,53 +4804,73 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> <translation type="unfinished"/> </message> </context> @@ -4575,63 +4891,73 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> + <location filename="../qt-ui/usersurvey.ui" line="14"/> + <source>User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="14"/> - <source>User Survey</source> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> <message> @@ -4801,12 +5127,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4814,79 +5147,79 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Έτος > Μήνας / Ταξίδι</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Συνολική Διάρκεια</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Μέσος Όρος</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Συντομότερο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Μακρύτερο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Μέσο Βάθος (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Ελάχιστο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Μέγιστο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>Μέσο SAC (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Μέση @@ -4902,13 +5235,13 @@ SAC (%1)</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4919,16 +5252,16 @@ SAC (%1)</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4954,120 +5287,120 @@ SAC (%1)</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) ή (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>αέρας</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>ενσωματωμένα</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>ζώνη</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>αστραγάλου</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>βάρος backplate</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Αποτυχία ανάγνωσης '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Μέγιστο αριθμός υποστηριζόμενων στηλών στην εισαγωγή CSV είναι %d</translation> </message> @@ -5086,7 +5419,7 @@ SAC (%1)</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5100,7 +5433,7 @@ SAC (%1)</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>άνοδος</translation> @@ -5147,7 +5480,7 @@ SAC (%1)</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5303,42 +5636,42 @@ SAC (%1)</translation> <translation>Σφάλμα στα δείγματα</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Συμβάν: Περιμένοντας για ενέργεια από τον χρήστη</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Σφάλμα στην καταχώρηση του συμβάντος</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Σφάλμα στην καταχώρηση της ακύρωσης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Σφάλμα στην εισαγωγή δεδομένων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Αδύνατον να ανοιχθεί το %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5357,433 +5690,475 @@ SAC (%1)</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Σφάλμα στο ερώτημα get_events της βάσης δεδομένων -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Σφάλμα στην επικοινωνία με την βάση δεδομένων '%s' -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Σφάλμα στο ερώτημα της βάσης δεδομένων '%s' -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Σφάλμα στην επικοινωνία με την βάση δεδομένων '%s' +</translation> + </message> + <message> + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. +</source> + <translation>Σφάλμα στο ερώτημα της βάσης δεδομένων '%s' +</translation> + </message> + <message> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Αδύνατο το άνοιγμα του stylesheet %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Πάρα πολλά μείγματα αερίων</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dives)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 dive)</translation> </message> @@ -5948,97 +6323,97 @@ EADD: %d%s <translation>(καμία κατάδυση)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Κυρ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Δευ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Τρι</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Τετ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Πεμ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Παρ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Σαβ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Ιαν</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Φεβ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Μαρ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Απρ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Μαι</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Ιουν</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Ιουλ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Αυγ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Σεπ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Οκτ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Νοε</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Δεκ</translation> </message> diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index 691875511..3b3d575f0 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Person: </translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>Searches for buddies and divemasters</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Could not save the backup file %1. Error Message: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Could not open backup file: %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation>Dive computer details read successfully</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Setting successfully written to device</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Device firmware successfully updated</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Device settings successfully reset</translation> </message> @@ -847,72 +847,72 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Backup files (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>An error occurred while saving the backup file. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Backup succeeded</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>Your settings have been saved to: %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation>Backup dive computer settings</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation>XML backup error</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation>Restore dive computer settings</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation>XML restore error</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation>An error occurred while restoring the backup file. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>Restore succeeded</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>Your settings have been restored successfully.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Select firmware file</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>All files (*.*)</translation> </message> @@ -1071,22 +1071,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Device ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Nickname</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Clicking here will remove this dive computer.</translation> </message> @@ -1094,18 +1094,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Bailing out to OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation> begin</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation> end</translation> @@ -1114,97 +1114,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Cyl</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Location</translation> </message> @@ -1212,87 +1212,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Expand all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Collapse all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Collapse others</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Remove dive(s) from trip</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Create new trip above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Add dive(s) to trip immediately above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Add dive(s) to trip immediately below</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Merge trip with trip above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Merge trip with trip below</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Delete dive(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Mark dive(s) invalid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Merge selected dives</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Renumber dive(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Shift times</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Load images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Open image files</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1300,54 +1300,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Export format</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Worldmap</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Selection</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Selected dives</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>All dives</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1362,107 +1357,133 @@ <translation>General export</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation>DiveShare</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation>Image depths</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>General settings</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Subsurface numbers</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation>Export yearly statistics</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Export list only</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Style options</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Font size</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Theme</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Light</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Sand</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF files (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV files (*.csv *.CSV)</translation> </message> @@ -1473,77 +1494,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Comma separated values that include the most relevant information of the dive profile.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Send the dive data to divelogs.de website.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation>Send the dive data to dive-share.appspot.com website</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML export of the dive locations, visualised on a world map.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Subsurface native XML format.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation>Write depths of images to file.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Export UDDF file as</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Export CSV file as</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Export world map</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML files (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Export Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML files (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation>Save image depths</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Export HTML files as</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Can't open file %s</translation> </message> @@ -1582,7 +1609,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Time</translation> </message> @@ -1608,25 +1635,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Field separator</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Units</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metric</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperial</translation> </message> @@ -1641,100 +1668,160 @@ <translation>Manual dives</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Date format</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>dd.mm.yyyy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation>mm/dd/yyyy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation>yyyy-mm-dd</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Dive No.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation>Dive duration in seconds or in min:sec format</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Max depth</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Field configuration</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Mean depth</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Weight</translation> </message> @@ -1846,77 +1933,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Time</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Pressure</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperature</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Colour</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Pressure S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation>Ambient pressure</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Pressure I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>User entered</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Cylinder index</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Ceiling</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1967,127 +2069,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Cyl</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2191,54 +2293,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Retry</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Find Uemis dive computer</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Choose file for divecomputer download logfile</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Log files (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Warning</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Saving the libdivecomputer dump will NOT download dives to the dive list.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Choose file for divecomputer binary dump file</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Dump files (*.bin)</translation> </message> @@ -2311,17 +2413,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation>Key</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Value</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2360,17 +2487,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation>Firmware update failed.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>Could not a establish connection to the dive computer.</translation> </message> @@ -2378,7 +2505,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Edit selected dive locations</translation> </message> @@ -2386,7 +2513,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Location: </translation> </message> @@ -2402,330 +2529,330 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Coordinates</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Visibility</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Suit</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Dive notes</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Air temp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Equipment</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Gases used</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Gas consumed</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Max. depth</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Air pressure</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Dive time</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Total time</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Gas consumption</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation>Extra data</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation>Additional data from dive computer</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Time</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Dive info</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Interval</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Avg. depth</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Salinity</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Stats</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperature</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Dives</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Photos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Cylinders</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Weights</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation>Apply changes</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation>Discard changes</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Add cylinder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation>Add weight system</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Air temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Water temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>This trip is being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Multiple dives are being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>This dive is being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Trip notes</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Trip location</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Deepest dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Shallowest dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation>Highest total SAC of a dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation>Lowest total SAC of a dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation>Average total SAC of all selected dives</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation>Highest temperature</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation>Lowest temperature</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation>Average temperature of all selected dives</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation>Longest dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation>Shortest dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation>Average length of all selected dives</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2734,17 +2861,17 @@ mixed from Air and using: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation> and </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Discard the changes?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>You are about to discard your changes.</translation> </message> @@ -2752,92 +2879,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&File</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation>Export dive logs</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Toggle pHe graph</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Toggle calculating all tissues</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Toggle DC reported ceiling</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Toggle calculated ceiling</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Toggle NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Toggle calculated ceiling with 3m increments</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Configure &dive computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Re-plan &dive</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Toggle heart rate</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>Toggle MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Toggle EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>Toggle SAC rate</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Toggle ruler</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Print</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2850,486 +2977,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&View</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&New logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>New</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Open logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Open</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Save</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Save</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Sa&ve as</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Save as</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>&Close</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Close</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>P&references</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Import &GPS data from Subsurface web service</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>&Copy dive components</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>&Paste dive components</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>&Profile</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>&All</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>&Next DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>&About Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>&Globe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Import &from divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>&Full screen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Toggle full screen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>&Check for updates</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>&Export</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation>Toggle pO₂ graph</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation>Toggle pN₂ graph</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Scale graph</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation>Toggle pictures</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation>Toggle tank bar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>&Filter divelist</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation>Toggle tissue graph</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Print</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&Quit</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Import from &dive computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Renumber</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>&Edit device names</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>&Add dive</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Auto &group</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>&Yearly statistics</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>&Dive list</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>P&revious DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Left</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Right</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>User &manual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>P&lan dive</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>&Import log files</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Import divelog files from other applications</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Open file</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Print runtime table</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Warning</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3337,12 +3469,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter shows %1 (of %2) dives</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3400,387 +3572,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Defaults</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Units</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Graph</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Language</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Network</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Font size</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Dives</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Use default</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animations</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Speed</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Clear all settings</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Reset all settings to their default value</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metric</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personalise</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>metre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>feet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>litre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>System default</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Proxy type</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Hostname</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Requires authentication</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Username</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Password</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Pressure</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Lists and tables</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Default dive log file</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Display invalid</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Default cylinder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Use default cylinder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface web service</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Default user ID</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Save user ID locally?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperature</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Time units</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minutes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Seconds</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Show</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow at max depth</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Misc</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Preferences</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Ascent/descent speed denominator</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Threshold when showing pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Threshold when showing pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Threshold when showing pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Max pO₂ when showing MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Draw dive computer reported ceiling red</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Show unused cylinders in Equipment tab</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Show average depth</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>No proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>System proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Restart required</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>To correctly load a new language you must restart Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Open default log file</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Warning</translation> </message> @@ -3907,72 +4094,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Dive No. %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Max depth: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Duration: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Gas used:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Tags:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Weights:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Notes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Suit:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Viz:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Rating:</translation> </message> @@ -3980,103 +4167,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (No.%1 of %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Show NDL / TTS was disabled because of excessive processing time</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Make first dive computer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Delete this dive computer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Add gas change</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation>Add set-point change</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Add bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Remove event</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Hide similar events</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Edit name</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <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="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Unhide all events</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Hide events</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Hide all %1 events?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Remove the selected event?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Edit name of bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Custom name:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Name is too long.</translation> </message> @@ -4104,22 +4291,22 @@ p, li { white-space: pre-wrap; } <translation>Close</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Average</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Maximum</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Move the map and double-click to set the dive location</translation> </message> @@ -4187,12 +4374,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>Could not a establish connection to the dive computer.</translation> </message> @@ -4206,12 +4393,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>New starting number</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>New number</translation> </message> @@ -4219,12 +4406,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>Could not a establish connection to the dive computer.</translation> </message> @@ -4303,12 +4490,12 @@ p, li { white-space: pre-wrap; } <translation>Which date and time are displayed on the image?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Open image file</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4358,6 +4545,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4381,8 +4682,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4436,7 +4737,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Suits: </translation> </message> @@ -4452,11 +4753,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Add cylinder</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4466,7 +4762,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Tags: </translation> </message> @@ -4516,54 +4812,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Check for updates.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface was unable to check for updates.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>The following error occurred:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Please check your internet connection.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation>You are using the latest version of Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation>A new version of Subsurface is available.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation>Latest version is %1, please check with your OS vendor for updates.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation>Newest release version is </translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>There was an error while trying to check for updates.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4583,64 +4899,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>User Survey</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Subsurface user survey</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Recreational diver</translation> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Technical diver</translation> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Interested in dive planning</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>I am downloading dives from supported dive computer</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>I am importing dives from other software / sources</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>I am manually entering dives</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>I use the Android companion app to track dive locations</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Please type suggestions (in English) in the following box</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>The following information about your system will also be submitted</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4813,12 +5139,19 @@ OS CPU Architecture: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>Could not a establish connection to the dive computer.</translation> </message> @@ -4826,79 +5159,79 @@ OS CPU Architecture: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Year > Month / Trip</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Duration Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Average</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Shortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Longest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Depth (%1) Average</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Average</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4914,13 +5247,13 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4931,16 +5264,16 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4966,120 +5299,120 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) or (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>air</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integrated</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>belt</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>ankle</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>backplate weight</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Failed to read '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>Cannot open CSV file %s; please use Import log file dialog</translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon import failed: unable to read '%s'</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation>Mouth piece position OC</translation> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation>Mouth piece position CC</translation> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation>Mouth piece position unknown</translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation>Mouth piece position not connected</translation> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation>Power off</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation>O₂ calibration failed</translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation>O₂ calibration</translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation>No matching DC found for file '%s'</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maximum number of supported columns on CSV import is %d</translation> </message> @@ -5098,7 +5431,7 @@ Maximum</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation>battery</translation> </message> @@ -5112,7 +5445,7 @@ Maximum</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>ascent</translation> @@ -5159,7 +5492,7 @@ Maximum</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5315,42 +5648,42 @@ Maximum</translation> <translation>Error parsing the samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Error registering the event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Dive data import error</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Unable to open %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Insufficient privileges to open the device %s %s (%s)</translation> </message> @@ -5369,222 +5702,254 @@ Maximum</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Database query get_events failed. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Database query get_tags failed. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Database connection failed '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Database query failed '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Database query get_cylinders failed. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. </source> - <translation>Database query get_changes failed. + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Database connection failed '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Database query get_profile_sample failed. + <translation>Database query failed '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Can't open stylesheet %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Too many gas mixes</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Decompression calculation aborted due to excessive time</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>based on GFlow = %d and GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurface dive plan</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>depth</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>duration</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <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="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <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="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Switch gas to %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Switch gas to %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gas consumption (CCR legs excluded):</translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Gas consumption:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Warning:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <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="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>not enough reserve for gas sharing on ascent!</translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s during planned ascent) of %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5593,70 +5958,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5665,7 +6030,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5674,162 +6039,168 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Safety Stop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Safety Stop: unkn time @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: unkn time @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>In deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Calculated ceiling %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tissue %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>heartbeat: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>bearing: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dives)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 dive)</translation> </message> @@ -5994,97 +6365,97 @@ EADD: %d%s <translation>(no dives)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Sun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Mon</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Tue</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Wed</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Thu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Fri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Sat</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>May</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index 533794d26..930469d98 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Persona:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>Busca por compañeros y divemasters</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>No se pudo guardar copia de seguridad del archivo %1. Mensaje de error: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>No se pudo abrir la copia de seguridad: %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation>Detalles del ordenador leídos correctamente</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Ajuste grabado correctamente en el dispositivo</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Firmware del dispositivo actualizado con éxito</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Ajustes del dispositivo reiniciados con exito</translation> </message> @@ -847,72 +847,72 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Archivos de copia de seguridad (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>Sucedió un error al guardar la copia de seguridad. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Copia de seguridad correcta</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>Se han guardado los ajustes en: %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation>Hacer copia de seguridad de los ajustes</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation>Error en la copia de seguridad XML</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation>Recuperar ajustes del ordenador de buceo</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation>Error al recuperar el XML</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ocurrió un error al recuperar la copia de seguridad. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>Recuperación correcta</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>Los ajustes se han recuperado correctamente.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Seleccionar archivo de firmware</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>Todos los archivos (*.*)</translation> </message> @@ -1072,22 +1072,22 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>ID del dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Nombre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Hacer clic aquí borrará este ordenador de buceo.</translation> </message> @@ -1095,18 +1095,18 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Cambio de emergencia a OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>comienzo</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>fin</translation> @@ -1115,97 +1115,97 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Valoración</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Prof.(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Lastre(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Traje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Bot</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>CNS máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Ubicación</translation> </message> @@ -1213,87 +1213,87 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Contraer todo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Contraer otras</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Borrar inmersión(es) del viaje</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Crear nuevo viaje por encima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Añadir inmersión(es) al viaje de arriba</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Añadir inmersión(es) al viaje de debajo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Combinar viaje con el viaje de encima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Combinar viaje con el viaje de abajo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Borrar inmersión(es)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Marcar inmersión(es) como no válida(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Mezclar las inmersiones seleccionadas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Renumerar inmersiones</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Desplazar horas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Cargar imágenes</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Abrir archivos de imagen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Archivos de imagen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1301,54 +1301,49 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Formato de exportación</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>XML de Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Mapamundi</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Selección</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Inmersiones seleccionadas</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Todas las inmersiones</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1363,107 +1358,133 @@ el ordenador de buceo seleccionado?</translation> <translation>Exportación general</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation>DiveShare</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation>Profundidad de las imágenes</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Ajustes generales</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Numeración de Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation>Exportar estadísticas anuales</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Exportar solo la lista</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Opciones de estilo</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Tipo de letra</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Tamaño de letra</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Iluminación</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Arena</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Archivos UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>Archivos CSV (*.csv *.CSV)</translation> </message> @@ -1474,77 +1495,83 @@ el ordenador de buceo seleccionado?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Valores separados por comas que incluyen la información más relevante del perfil de inmersión.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Enviar los datos de buceo a la web de divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation>Enviar los datos de buceo al sitio web dive-share.appspot.com</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Exporta las ubicaciones de buceo en HTML, visualizándolas en un mapa mundial.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Formato XML nativo de Subsurface.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation>Escribir la profundidad de las imágenes a archivo.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Exportar archivo UDDF como</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Exportar archivo CSV como</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Exportar Mapamundi</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>Archivos HTML (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Exportar a XML de Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>Archivos XML (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation>Guardar profundidades de las imágenes</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Exportar archivos HTML como</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>No se puede abrir el archivo %s</translation> </message> @@ -1583,7 +1610,7 @@ el ordenador de buceo seleccionado?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Hora de entrada</translation> </message> @@ -1609,25 +1636,25 @@ el ordenador de buceo seleccionado?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Separador de campos</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Unidades</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Métrico</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperial</translation> </message> @@ -1642,100 +1669,160 @@ el ordenador de buceo seleccionado?</translation> <translation>Inmersiones manuales</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation>Elige el orden de día, mes y año para el formato de la fecha. El separador de campos puede ser cualquiera de los siguientes caracteres .-/. </translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Formato de fecha</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>dd.mm.aaaa</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation>mm/dd/aaaa</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation>aaaa-mm-dd</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Inmersión #</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation>Fecha en formato dd.mm.aaaa, aaaa-mm-dd o mm/dd/aaaa</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation>Duración del buceo en segundos o en formato min:seg</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Etiquetas</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Ubicación</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Profundidad máxima</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Configuración de campos</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Profundidad media</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Compañero</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Notas</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Peso</translation> </message> @@ -1847,77 +1934,92 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Profundidad</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Hora de entrada</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Presión</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Color</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Presión S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation>Presión ambiental</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Presión I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Introducido por el usuario</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Índice de botellas</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Techo</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>CAS</translation> </message> @@ -1968,127 +2070,127 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Valoración</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Prof.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Lastre(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Traje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Bot</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>CNS máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Ubicación</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Prof.(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2192,54 +2294,54 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Intentar de nuevo</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Encontrar ordenador de buceo Uemis</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Selecciona archivo para registro de descarga de libdivecomputer</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Archivos Log (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Guardar el volcado de libdivecomputer NO descargará buceos a la lista de inmersiones.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Selecciona archivo para el volcado binario del ordenador de buceo</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Archivos de volcado (*.bin)</translation> </message> @@ -2312,17 +2414,42 @@ el ordenador de buceo seleccionado?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation>Clave</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Valor</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2361,17 +2488,17 @@ el ordenador de buceo seleccionado?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta función no está disponible, todavía, para el ordenador seleccionado</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation>¡ Ha fallado la actualización de firmware !</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>No se pudo establecer conexión con el ordenador de buceo.</translation> </message> @@ -2379,7 +2506,7 @@ el ordenador de buceo seleccionado?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Editar los puntos de buceo seleccionados.</translation> </message> @@ -2387,7 +2514,7 @@ el ordenador de buceo seleccionado?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Ubicación:</translation> </message> @@ -2403,330 +2530,330 @@ el ordenador de buceo seleccionado?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Ubicación</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Coordenadas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Compañero</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Etiquetas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Valoración</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Visibilidad</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Traje</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Notas de la inmersión</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Temperatura del aire</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Temperatura del agua</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Notas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Equipo</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Gases usados</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Gas consumido</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Prof. máxima</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Presión atmosférica</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Duración de la inmersión</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Tiempo total</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Consumo de gas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation>Otros datos</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation>Datos adicionales del ordenador de buceo</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Hora de entrada</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Información de la inmersión</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Intervalo</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Prof. media</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Salinidad</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Estadísticas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Profundidad</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Inmersiones</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Fotos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Botellas</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Lastre</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation>Aplicar cambios</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation>Descartar cambios</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Añadir botella</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation>Añadir sistema de lastre</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Temp. aire [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Temp. agua [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Este viaje está siendo editado.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Se están editando varias inmersiones.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Esta inmersión esta siendo editada.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Notas del viaje</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Ubicación del viaje</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Inmersión más profunda</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Inmersión más superficial</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation>Mayor CAS total de una inmersión</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation>Menor CAS total de una inmersión</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation>CAS total promedio de todas las inmersiones seleccionadas </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation>Temperatura más alta</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation>Temperatura más baja</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation>Temperatura promedia de todas las inmersiones seleccionadas</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation>Inmersión más larga</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation>Inmersión más corta</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation>Duración promedia de todas las inmersiones seleccionadas</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2735,17 +2862,17 @@ a partir de aire y usando: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>y</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>¿ Descartar los cambios ?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Estás a punto de descartar tus cambios.</translation> </message> @@ -2753,92 +2880,92 @@ a partir de aire y usando: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>Archivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation>Exportar diarios de buceo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Activar el gráfico de pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Activar cálculo de todos los tejidos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Activar techo informado por el ordenador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Activar techo calculado</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Activar LND, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Activar techo calculado con incrementos de 3m</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Configurar or&denador de buceo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Re-planificar inmersión</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Activar ritmo cardiaco</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>Activar PMO</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Activar PEA, PNE y EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>Activar tasa de CAS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Activar regla</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Detalles del plan de inmersión</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Imprimir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2851,486 +2978,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>Registro</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Vista</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Importar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Nuevo registro</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Nuevo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>Abrir registr&o</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Guardar como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Guardar como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>&Cerrar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Cerrar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>P&referencias</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importar datos &GPS del servicio web de Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>&Copiar componentes</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>&Pegar componentes</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>&Perfil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>&Información</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>Todo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>Siguie&nte ordenador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>&Acerca de Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>&Globo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Importar desde Divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>Pantalla completa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Activar pantalla completa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>&Comprobar si hay actualizaciones</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>&Exportar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation>Activar gráfico de pO₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation>Activar gráfico de pN₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Escalar gráfico</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation>Activar fotografías</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation>Activar barra de la botella</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>&Filtrar la lista de inmersiones</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation>Activar el gráfico de tejidos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>Im&primir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>Salir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Importar del or&denador de buceo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>&Editar nombres de dispositivos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>&Añadir inmersión</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Auto a&grupar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>Estadísticas anuales</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>Lista &de Inmersiones</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Ante&rior ordenador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Izquierda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Derecha</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>&Manual de usuario</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>P&lanificar inmersión</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>&Importar archivos de registro</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Importar archivos de registro de otras aplicaciones</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Abrir archivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Imprimir tabla de tiempo acumulado</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>¿Guardar cambios?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Guardar archivo como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Abrir archivo de registro de inmersiones</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation>Archivos de divelog (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Archivos de Cochran (*.can);;Archivos CSV (*.csv);;Archivos de divelogs.de (*.dld);;Archivos de JDiveLog (*.jlb);;Archivos de Liquivision (*.lvd);;Archivos de MkVI (*.txt);;Archivos de Suunto (*.sde *.db);;Archivos UDDF/UDCF (*.uddf *.udcf);;Archivos XML (*.xml);;Todos los archivos (*)</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Estadísticas anuales</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3338,12 +3470,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>Los filtros muestran %1 (de %2) inmersiones</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3401,387 +3573,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Predeterminadas</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Unidades</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Gráfico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Lenguaje</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Red</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Tipo de letra</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Tamaño de letra</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Inmersiones</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Predeterminado</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>…</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animaciones</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Velocidad</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Borrar todos los ajustes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Reiniciar todos los ajustes a sus valores por defecto</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Métrico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personalizar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Profundidad</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>metro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>pie</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>litro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>pie³</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Predeterminado del sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Tipo de proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Puerto</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Requiere autenticación</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Nombre de usuario</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Contraseña</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filtros</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Presión</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Listas y tablas</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Archivo de registro por defecto</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Mostrar no validas</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Botella por defecto</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Usar botella por defecto</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Servicio web de Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>ID de usuario por defecto</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>¿Guardar localmente la ID de usuario?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volumen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Unidades de tiempo</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minutos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Segundos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Mostrar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GF bajo a la máxima profundidad</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Varios</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Preferencias</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Denominador de la velocidad de ascenso/descenso</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Umbral al mostrar la pO₂ </translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Umbral al mostrar la pN₂ </translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Umbral al mostrar la pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Max pO₂ al mostrar PMO</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Trazar en rojo el techo informado por el ordenador de buceo</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Mostrar botellas no usadas en la pestaña Equipo</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Mostrar la profundidad media</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GF bajo</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GF alto</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Sin proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Proxy del sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>Proxy HTTP</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Reinicio requerido</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Para cargar correctamente un nuevo lenguaje debes reiniciar Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Si pulsas ACEPTAR, todos los ajustes de Subsurface se reiniciarán a sus valores por defecto. Esto se aplicará inmediatamente.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Abrir archivo de registro por defecto</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Advertencia</translation> </message> @@ -3908,72 +4095,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Inmersión n.º %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Profundidad máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Duración: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Gas usado:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Etiquetas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>CAS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Lastre:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Compañero:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Traje:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Visibilidad:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Calificación:</translation> </message> @@ -3981,103 +4168,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Mostrar LND/TTS se ha desactivado por excesivo tiempo de proceso</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Hacer que sea el ordenador de buceo pricipal</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Borrar este ordenador de buceo</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Añadir cambio de gas</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation>(Botella %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation>Añadir cambio de "set-point"</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Añadir marca</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Borrar evento</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Ocultar eventos similares</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Editar nombre</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <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="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Revelar todos los eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>¿ Ocultar todos los eventos %1 ?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>¿ Borrar el evento seleccionado ?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Editar el nombre de la marca</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Nombre personalizado:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>¡El nombre es demasiado largo!</translation> </message> @@ -4105,22 +4292,22 @@ p, li { white-space: pre-wrap; } <translation>Cerrar</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Promedio</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Mínima</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Máxima</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Mueve el mapa y haz doble click para fijar la posición del buceo</translation> </message> @@ -4188,12 +4375,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta función no esta disponible, todavía, para el ordenador seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>No se pudo establecer conexión con el ordenador de buceo.</translation> </message> @@ -4207,12 +4394,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Número de partida nuevo</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Nuevo número</translation> </message> @@ -4220,12 +4407,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta función no está disponible, todavía, para el ordenador seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>No se pudo establecer conexión con el ordenador de buceo.</translation> </message> @@ -4304,12 +4491,12 @@ p, li { white-space: pre-wrap; } <translation>¿ Que fecha y hora se muestran en la imagen ?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Abrir archivo de imagen</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Archivos de imagen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4359,6 +4546,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4382,8 +4683,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Software de registro de inmersiones multiplataforma<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4437,7 +4738,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Trajes:</translation> </message> @@ -4453,11 +4754,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Añadir botella</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4467,7 +4763,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Etiquetas:</translation> </message> @@ -4517,54 +4813,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Buscar actualizaciones</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface no pudo buscar actualizaciones.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Ocurrió el siguiente error:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Por favor, comprueba la conexión a internet.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation>Está usando la última versión de Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Está disponible una nueva versión de Subsurface.<br/>Pulse en:<br/><a href="%1">%1</a><br/> para descargarla.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation>Está disponible una nueva versión de Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation>La última versión es %1, por favor, comprueba actualizaciones con el proveedor de tu SO.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation>La versión más reciente es</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Hubo un error al intentar buscar actualizaciones. <br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4584,64 +4900,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Nos encantaría aprender más sobre nuestros usuarios, sus preferencias y sus hábitos de uso. Por favor, invierte un minuto en rellenar este formulario y remitirlo al equipo de Subsurface. Por favor, selecciona todas las opciones que te sean de aplicación.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Encuesta a usuarios</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Encuesta a usuarios de Subsurface</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Buceador recreativo</translation> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Buceador técnico</translation> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Interesado en planificación de inmersiones</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Descargo inmersiones de un ordenador de buceo soportado</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Importo inmersiones desde otro software / otra fuente</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Introduzco inmersiones manualmente</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Utilizo la app android Companion para tomar ubicaciones de buceo</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Por favor, introduce sugerencias (en inglés) en la casilla a continuación</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>También se remitirá la siguiente información sobre tu sistema</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4814,12 +5140,19 @@ Arquitectura del SO CPU : %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta función no está disponible, todavía, para el ordenador seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>No se pudo establecer conexión con el ordenador de buceo.</translation> </message> @@ -4827,79 +5160,79 @@ Arquitectura del SO CPU : %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Año > Mes / Viaje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Duración Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Más corta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Más larga</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Profundidad (%1) Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Mínimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>CAS (%1) Medio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4915,13 +5248,13 @@ Media</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4932,16 +5265,16 @@ Media</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4967,120 +5300,120 @@ Media</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) o (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>aire</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integrado</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>cinturón</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>tobillo</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>lastre en el arnes</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>No se pudo leer «%s»</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>No se puede abrir el archivo CSV %s; por favor, utilice el diálogo "Importar archivos de registro"</translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Importación de Poseidon ha fallado: imposible leer '%s'</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation>Posición de la boquilla OC</translation> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation>Posición de la boquilla CC</translation> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation>Posición de la boquilla desconocida</translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation>Posición de la boquilla no conectada</translation> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation>Apagar</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation>Ha fallado el calibrado de O₂ </translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation>Calibrado de O₂ </translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation>No se ha encontrado concordancia con ningún DC para el archivo '%s'</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>El máximo número de columnas que soporta importar CSV es %d</translation> </message> @@ -5099,7 +5432,7 @@ Media</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation>batería</translation> </message> @@ -5113,7 +5446,7 @@ Media</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>ascenso</translation> @@ -5160,7 +5493,7 @@ Media</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5316,42 +5649,42 @@ Media</translation> <translation>Error al analizar las muestras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Evento: esperando acción del usuario</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modelo=%u (0x%08x), firmware=%u (0x%08x), n.º de serie=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Error al registrar el manejador de eventos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Error al registrar el manejador de cancelación</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Error al importar datos de inmersiones</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>No es posible crear el contexto de libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>No se pudo abrir %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Privilegios insuficientes para abrir el dispositivo %s %s (%s)</translation> </message> @@ -5370,222 +5703,254 @@ Media</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Falló la petición get_events a la base de datos. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Consulta de la base de datos get_tags falló. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Falló la conexión a la base de datos «%s». -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Falló la petición a la base de datos «%s». -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Consulta de la base de datos get_cylinders falló. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. </source> - <translation>Consulta de la base de datos get_changes falló. + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Falló la conexión a la base de datos «%s». </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Consulta de la base de datos get_profile_sample falló. + <translation>Falló la petición a la base de datos «%s». </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>No se puede abrir la hoja de estilo %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>No puedo encontrar el gas %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Demasiadas mezclas de gas</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Cálculo de descompresión abortado por exceso de tiempo</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>basado en GFbajo = %d y GFalto = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Plan de buceo de Subsurface</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>Profundidad</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>Tiempo acumulado</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>Duración</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>Gas</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Transición a %.*f %s en %d:%02d min - tiempo acumulado %d:%02u con %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Cambio de cota a %.*f %s en %d:%02d min - tiempo acumulado %d:%02u con %s</translation> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Permanecer a %.*f %s durante %d:%02d min - tiempo acumulado %d:%02u con %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Permanecer a %.*f %s durante %d:%02d min - tiempo acumulado %d:%02u con %s</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Cambiar gas a %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Cambiar gas a %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consumo de gas (excluidos segmentos con CCR)</translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Consumo de gas:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Aviso:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>DESCARGO DE RESPONSABILIDAD / AVISO: ESTA ES UNA NUEVA IMPLEMENTACIÓN DEL ALGORITMO BUHLMANN Y UNA IMPLEMENTACIÓN DE UN PLANIFICADOR DE INMERSIÓN BASADO EN ÉL QUE SOLO HA SIDO PROBADA DE FORMA LIMITADA. RECOMENDAMOS FIRMEMENTE NO PLANIFICAR INMERSIONES BASADAS SIMPLEMENTE EN LOS RESULTADOS QUE SE OBTENGAN AQUÍ.</translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation>!Esto es más gas del disponible en la botella especificada¡</translation> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>¡Reserva insuficiente para compartir gas durante el ascenso!</translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s en el ascenso planeado)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante el ascenso planeado) of %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>Valor de pO₂ alto %.2f a %d:%02u con %s a la profundidad de %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5594,70 +5959,70 @@ Prof: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>Pres: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>CAS: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>PMO: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5666,7 +6031,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5675,162 +6040,168 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Parada de seguridad: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Parada de seguridad: tiempo desc @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Parada deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Parada deco: tiempo desc @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>En deco </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Parada deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>En deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Techo calculado %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tejido %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>Ritmo cardiaco: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>Soporte: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sProf:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sProf:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sPres:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 inmersiones)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 inmersión)</translation> </message> @@ -5995,97 +6366,97 @@ EADD: %d%s <translation>(ninguna inmersión)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Do</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Lu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Ma</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Mi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Ju</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Vi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Sa</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Ene</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Mayo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Dic</translation> </message> diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index 43b19d8bc..349e9af58 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1069,22 +1069,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Mudel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Seadme ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Hüüdnimi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Siin klikates eemaldate selle sukeldumiskompuutri.</translation> </message> @@ -1092,18 +1092,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Üleminek avatud süsteemile</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation> algus</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation> lõpp</translation> @@ -1112,97 +1112,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Kuupäev</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Hinne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Ülikond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Ball</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Asukoht</translation> </message> @@ -1210,87 +1210,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Laienda kõik</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Ahenda kõik kokku</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Ahenda teised</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Eemalda sukeldumine/sukeldumised väljasõidust</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Loo uus väljasõit üles</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Lisa sukeldumine/sukeldumised otse eespool asuvale väljasõidule</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Lisa sukeldumine/sukeldumised otse allpool asuvale väljasõidule</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Ühenda väljasõit väljasõiduga ülal</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Ühenda väljasõit väljasõiduga all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Kustuta sukeldumine/sukeldumised</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Märgi sukeldumine/sukeldumised kehtetuks</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Ühenda valitud sukeldumised</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Nummerda sukeldumine/sukeldumised ümber</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Nihuta ajad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Lae pildid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Ava pildifailid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Pildifailid (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1298,54 +1298,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Ekspordi formaat</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Maailmakaart</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Valik</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Valitud sukeldumised</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Kõik sukeldumised</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1360,107 +1355,133 @@ <translation>Üldine eksport</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Üldised seaded</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Subsurface numbrid</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Ekspordi ainult nimekiri</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Stiili valikud</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Fondi suurus</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Teema</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Valgus</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Liiv</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF failid (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV failid (*.csv *.CSV)</translation> </message> @@ -1471,77 +1492,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Eraldajaga (koma, tab, vms) eraldatud väärtused mis sisaldavad kõige olulisemat sukeldumise profiili infot.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Saada sukeldumiste info divelogs.de kodulehele</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Maailmakaardil visualiseeritavate sukeldumiskohtade eksport HTML-formaadis</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Subsurface oma XML vorming</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Ekspordi UDDF fail kui</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Ekspordi CSV fail kui</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Ekspordi maailmakaart</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML failid (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Ekspordi Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML failid (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Ekspordi HTML fail kui</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Ei saa avada faili %s</translation> </message> @@ -1580,7 +1607,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Aeg</translation> </message> @@ -1606,25 +1633,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Välja eraldaja</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Ühikud</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>SI</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Briti/Ameerika</translation> </message> @@ -1639,100 +1666,160 @@ <translation>Käsitsi sisestatud sukeldumised</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Sukeldumise #</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Kuupäev</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Märgendid</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Asukoht</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Max sügavus</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Välja vorming</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Keskmine sügavus</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Semu</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Märkmed</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Raskus</translation> </message> @@ -1844,77 +1931,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Sügavus</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Aeg</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Rõhk</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Värvus</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Rõhk S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHE</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Rõhk I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Kasutaja sisestatud</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Ballooni indeks</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Lagi</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1965,127 +2067,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Kuupäev</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Hinne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Sügavus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Raskus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Ülikond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Ball</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Asukoht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>Hapnikumürgistuse ühik (OTU)</translation> </message> @@ -2189,54 +2291,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Viga</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Korda</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Leia Uemis sukeldumiskompuuter</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Vali sukeldumiskompuutri allalaadimise logifail</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Logifailid (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Hoiatus</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>libdivecomputer tõmmisefaili salvestamine EI LAE sukeldumised sukeldumiste listi.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Vali sukeldumiskompuutri binaarformaadis tõmmisefail</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Tõmmisefailid (*.bin)</translation> </message> @@ -2309,17 +2411,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2358,17 +2485,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2376,7 +2503,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Toimeta valitud sukeldumiskohti</translation> </message> @@ -2384,7 +2511,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2400,330 +2527,330 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Asukoht</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Koordinaadid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Semu</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Märgendid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Hinne</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Nähtavus</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Ülikond</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Sukeldumise märkmed</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Õhu temp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Vee temp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Märkmed</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Varustus</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Kasutatud gaasid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Kulutatud gaasid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Max sügavus</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Õhurõhk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Sukeldumise aeg</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Koguaeg</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Gaasi tarbimine</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Kuupäev</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Aeg</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Sukeldumise info</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Pinnaintervall</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Keskmine sügavus</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Soolsus</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Statistika</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Sügavus</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Sukeldumisi kokku</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Fotod</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Balloonid</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Raskused</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Lisa balloon</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Õhu temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Vee temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Seda väljasõitu toimetatakse</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Mitut sukeldumist toimetatakse</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Seda sukeldumist toimetatakse.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Väljasõidu märkmed</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Väljasõidu koht</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Sügavaim sukeldumine</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Madalaim sukeldumine</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2731,17 +2858,17 @@ mixed from Air and using: õhust ja kasutades:</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>ja</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Loobu muudatustest?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Oled muudatustest loobumas.</translation> </message> @@ -2749,92 +2876,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&Fail</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>pHe graaf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Kõik koed</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Sukeldumiskompuutri poolt antud lagi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Arvutatud lagi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Arvutatud lagi 3m intervalliga</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Südame pulss</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>SAC määr</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Joonlaud</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Sukeldumise plaani detailid</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Väljastus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2847,486 +2974,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Logi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Vaade</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Abi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Uus logiraamat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Uus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Ava logiraamat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Ava</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Salvesta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Salvesta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Sa&lvesta nimega</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Salvesta nimega</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>&Sulge</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Sulge</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>Eelistused</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Impordi &GPS andmed Subsurface veebiteenusest</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>&Profiil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>&info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>&Kõik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>&Järgmine sukeldumiskompuuter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>Subsurface kohta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>&Maakera</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Import divelogs.de-st</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>&Täisekraan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Kuva täisekraan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>Kontrolli uuendusi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>&Eksport</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Väljastus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&Välju</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Impordi &sukeldumiskompuutrist</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Nummerda ümber</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>Toimeta sukeldumiskompuutrite hüüdnimesid</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>&Lisa sukeldumine</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Automaatne grupeerimine</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>&Aastane statistika</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>&Sukeldumiste nimekiri</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>CTRL+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>CTRL+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>&Eelmine sukeldumiskompuuter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Vasak</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Parem</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>Kasutaja &juhend</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>P&laneeri sukeldumine</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>&Impordi logifailid</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Impordi sukeldumislogi failid teistest rakendustest</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Ava fail</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Loobu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Väljasta jooksva aja tabel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Salvesta muudatused?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Salvesta nimega</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Ava sukeldumislogi fail</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Hoiatus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Aastane statistika</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation> </message> @@ -3334,12 +3466,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3397,388 +3569,403 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Vaike- väärtused</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Ühikud</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Graaf</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Keel</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Võrk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Fondi suurus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Sukeldumised</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Kasuta vaikeväärtust</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animatsioonid</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Kiirus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Kustuta kõik seaded</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Vii kõik seaded väikeväärtustele</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Süsteem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>SI</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Briti/Ameerika</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Isikupärasta</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Sügavus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>meeter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>jalg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>liiter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>kuupjalg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Süsteemi vaikeväärtus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Proxy tüüp</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Peaarvuti</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Nõuab autentimist</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Kasutajanimi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Salasõna</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Rõhk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Nimekirjad ja tabelid</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Vaikimis sukeldumise logi fail</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Kuva ebaõnnestunud</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Vaikimisi balloon</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Kasuta vaikimis ballooni</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface veebiteenus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Vaikimisi kasutaja ID</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Salvesta kasutaja ID lokaalselt?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Maht</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Raskus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Ajaühikud</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minutid</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Sekundid</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Näita</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFlow max sügavusel</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Muu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Eelistused</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Tõusu/laskumise kiiruse nimetaja</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Lävi pO₂ kuvamisel</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Lävi pN₂ kuvamisel</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Lävi pHe kuvamisel</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Max pO₂ MOD kuvamisel</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Joonista sukeldumiskompuutri väljastatud lagi punasega</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Näita kasutamata balloonid varustuse saki all</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Näita keskmine sügavus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Pole proxyt</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Süsteemi proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Nõutav taaskäivitus</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Uue keele kasutuselevõtuks tuleb Subsurface taaskäivitada.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Kui klikid OK, siis kõik Subsurface seaded viiakse nende vaikeväärtustele. See toimub viivitamata.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML failid (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Ava vaikimisi logifail</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Hoiatus</translation> </message> @@ -3905,72 +4092,72 @@ väärtused</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>tundmatu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Sukeldumine #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Max sügavus: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Kestus: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Kasutatud gaas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Märgendid:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Raskused:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Märkmed:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Semu:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Ülikond:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Nähtavus:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Hinne:</translation> </message> @@ -3978,103 +4165,103 @@ väärtused</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation>(#%1 %2st)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Loo esimene sukeldumiskompuuter</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Kustuta see sukeldumiskompuuter</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Lisa gaasivahetus</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Lisa järjehoidja</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Eemalda sündmus</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Peida sarnased sündmused</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Toimeta nimi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Peida kõik sündmused</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Peida sündmused</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Peida kõik %1 sündmust?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Eemalda valitud sündmus?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Toimeta järjehoidja nimi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Kohandatud nimi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Nimi on liiga pikk!</translation> </message> @@ -4102,22 +4289,22 @@ väärtused</translation> <translation>Sulge</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Keskmine</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Miinimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Maksimum</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Liigu kaardil soovitud kohta ja märgi topeltklikiga sukeldumiskoht</translation> </message> @@ -4185,12 +4372,12 @@ väärtused</translation> <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4204,12 +4391,12 @@ väärtused</translation> </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Uus algusnumber</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Uus number</translation> </message> @@ -4217,12 +4404,12 @@ väärtused</translation> <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4301,12 +4488,12 @@ väärtused</translation> <translation>Mis kuupäev ja kellaaeg on pildil?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Ava pildifail</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Pildifailid (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4356,6 +4543,120 @@ väärtused</translation> </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4379,8 +4680,8 @@ väärtused</translation> </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Sukeldumislogi tarkvara paljudele op-süsteemidele<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4434,7 +4735,7 @@ väärtused</translation> <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -4450,11 +4751,6 @@ väärtused</translation> <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Lisa balloon</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4464,7 +4760,7 @@ väärtused</translation> <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4514,54 +4810,74 @@ väärtused</translation> <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Kontrolli kas on uuendusi</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface ei saanud uurida uuenduste kohta.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Tekkis järgmine viga:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Palun kontrolli oma netiühendust.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Uuenduste olemasolu kontrolli viga.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4581,64 +4897,74 @@ väärtused</translation> <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Meile meeldiks rohkem teada saada oma kasutajatest, nende eelistustest ja kasutusharjumustest. Palun varu minut, et täita see vorm ja saata see Subsurface meeskonnale. Palun vali kõik võimalused, mis kehtivad sinu kohta.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Kasutajauuring</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Subsurface kasutajauuring</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Hobisukelduja</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Tehniline sukelduja</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Huvitatud sukeldumise planeerijast</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Ma laen sukeldumised kompuutrist alla</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Ma impordin sukeldumised teisest tarkvarast / allikast</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Ma sisestan sukeldumised manuaalselt</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Ma kasutan Androidi äppi sukeldumispaikade märkimiseks.</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Järgmisse kasti sisesta palun soovitusi (Inglise keeles)</translation> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Järgnev info sinu kasutatava süsteemi kohta saadetakse samuti meile</translation> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4811,12 +5137,19 @@ OS CPU Arhidektuur: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4824,79 +5157,79 @@ OS CPU Arhidektuur: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Aasta > Kuu / väljasõit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Kestus kokku</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Lühim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Pikim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Sügavus (%1) keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Max</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4912,13 +5245,13 @@ Max</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4929,16 +5262,16 @@ Max</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>jalg</translation> </message> @@ -4964,120 +5297,120 @@ Max</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>nael</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) või (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>õhk</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integreeritud</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>vöö</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>pahkluu</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>seljaplaadi kaal</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>külgeriputatav</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>'%s' lugemine ebaõnnestus</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>CSV impordil on max toetatud veergude arv %d</translation> </message> @@ -5096,7 +5429,7 @@ Max</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5110,7 +5443,7 @@ Max</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>tõus</translation> @@ -5157,7 +5490,7 @@ Max</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5313,42 +5646,42 @@ Max</translation> <translation>Viga proovide tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Sündmus: ootan kasutaja sekkumist</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>mudel=%u (0x%08x), püsivara=%u (0x%08x), seerianr=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Viga sündmuste draiveri registreerimisel.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Viga tühistamise draiveri registreerimisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Viga sukeldumise andmete impordil</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Ei saa luua libdivecomputer konteksti</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Ei saa avada %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5367,222 +5700,254 @@ Max</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Andmebaasi päring get_events ebaõnnestus. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Andmebaasi päring get_tags ebaõnnestus. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Andmebaasi ühendus ebaõnnestus '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Andmebaasi päring ebaõnnestus '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Andmebaasi päring get_cylinders ebaõnnestus. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. </source> - <translation>Andmebaasi päring get_changes ebaõnnestus. + <translation>Andmebaasi ühendus ebaõnnestus '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Andmebaasi päring get-profile_sample ebaõnnestus. + <translation>Andmebaasi päring ebaõnnestus '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Ei suuda avada stiililehte &s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Ei leia gaasi %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Liiga palju gaasisegusid</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Dekompressiooni arvutamine katkestatud liigse ajakulu tõttu</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>põhineb väärtustel GFlow = %d ja GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurface sukeldumise plaan</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>sügavus</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>jooksev aeg</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>kestus</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>gaas</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Vaheta gaasiks %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Gaasi tarbimine:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Hoiatus:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <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="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>pole piisavalt reservi gaasi jagamiseks tõusul!</translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s-st (%.0f%s/%.0f%s planeeritud tõusul)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s planeeritud tõusu jooksul) %s-st</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5591,70 +5956,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5663,7 +6028,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5672,157 +6037,163 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Ohutuspeatus: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Ohutuspeatus: teadmata aeg @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: teadmata aeg @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>Dekos </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (arvutatud)</translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>Dekos (arvutatud) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (arvutatud)</translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (arvutatud)</translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Arvutatud lagi %.0f%s</translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Kude %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>Pulss: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>Kurss: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 sukeldumist)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 sukeldumine)</translation> </message> @@ -5987,97 +6358,97 @@ EADD: %d%s <translation>(pole sukeldumisi)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Pühap</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Esmasp</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Teisip</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Kolmap</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Neljap</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Reede</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Laup</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Jaan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Veebr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Märts</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Juuni</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Juuli</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Sept</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Dets</translation> </message> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index dec252a74..6d1793f8d 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Henkilö:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>Etsii sukelluskavereita ja -kouluttajia</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Backup -tiedoston %1 tallennus epäonnistui. Virheviesti: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Backup -tiedoston avaus epäonnistui: %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation>Sukellustietokoneen tiedot luettu onnistuneesti</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Asetuksen tallennus laitteeseen onnistui</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Laitteen ohjelmisto on päivitetty onnistuneesti</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Laitteen asetukset on palautettu onnistuneesti</translation> </message> @@ -847,72 +847,72 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Varmuustiedostot (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>Virhe tallennettaessa varmistustiedostoa. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Varmistus onnistui</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>Asetuksesi on tallennettu: %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation>Varmuuskopioi sukellustietokoneen asetukset</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation>Virhe XML-varmuuskopioinnissa</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation>Palauta sukellustietokoneen asetukset</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation>XML-tiedoston palautuksessa virhe</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Virhe varmistustiedoston palautuksessa. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>Palautus onnistui</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>Asetuksesi on palautettu onnistuneesti.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Valitse laiteohjelmiston tiedosto</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>Kaikki tiedostot (*.*)</translation> </message> @@ -1071,22 +1071,22 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Malli</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Laite ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Lempinimi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Poista sukellustietokone.</translation> </message> @@ -1094,18 +1094,18 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Vaihto avoimeen ilman kiertoon</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>alku</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>loppu</translation> @@ -1114,97 +1114,97 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Ajankohta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Yleisarvio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Syvyys(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Lämpötila(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Massa(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Puku</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Säiliöt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Kaasu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>Pintakulutus(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>Happikertymä (OTU)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Kohde</translation> </message> @@ -1212,87 +1212,87 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Laajenna kaikki retket</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Supista kaikki retket</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Tiivistä muut</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Erota sukellukset retkestä</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Liitä uuteen retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Lisää sukellukset yläpuoliseen retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Lisää sukellukset alapuoliseen retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Liitä retki yllä olevaan retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Liitä retki alla olevaan retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Poista sukellukset</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Merkitse sukellukset epäkelvoiksi</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Uhdistä valitut sukellukset</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Numeroi uudelleen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Muuta aikoja</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Lataa kuvat</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Avaa kuvatiedostot</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Kuvatiedostot (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1300,54 +1300,49 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Tiedostomuoto</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Maailmankartta</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Valinta</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Valitut sukellukset</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Kaikki sukellukset</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1362,107 +1357,133 @@ poistaa valitun sukellustietokoneen?</translation> <translation>Yleiset vientimuodot</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation>DiveShare</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation>Kuvasyvyys</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Yleisasetukset</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Subsurfacen numerointi</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation>Vie vuositilastot</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Vie listamuodossa</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Tyyliasetukset</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Fontti</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Fontin koko</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Teema</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Vaalea</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Hiekka</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV tiedostot (*.csv *.CSV)</translation> </message> @@ -1473,77 +1494,83 @@ poistaa valitun sukellustietokoneen?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Arvot erotetaan pilkulla, jolloin tärkeimmät sukellusprofiilin tiedot voidaan ladata toiseen sovellukseen.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Lähetä sukellustiedot divelogs.de -verkkopalveluun.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation>Lähetä sukellustiedot dive-share.appspot.com -verkkopalveluun</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Tallenna sukelluskohteet HTML -tiedostoon, joka näyttää sijainnit maailmankartalla.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Subsurfacen oma XML -tiedostomuoto.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation>Tallenna kuvien syvyydet tiedostoon.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Vienti UDDF -tiedostoon</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Vienti CSV -tiedostoon</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Vie maailmankartta</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML -tiedostot (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Vie Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML -tiedostot (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation>Tallenna kuvien syvyydet</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Vie HTML -tiedostoihin</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Tiedoston avaus ei onnistu %s</translation> </message> @@ -1582,7 +1609,7 @@ poistaa valitun sukellustietokoneen?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Kello</translation> </message> @@ -1608,25 +1635,25 @@ poistaa valitun sukellustietokoneen?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Kentän erotin</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Yksiköt</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metrinen</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Brittiläinen</translation> </message> @@ -1641,100 +1668,160 @@ poistaa valitun sukellustietokoneen?</translation> <translation>Vapaa CSV -tiedostosta tuonti</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation>Valitse päivämäärän muoto (päivä, kuukausi ja vuosi). Kenttien erotin voi olla mikä tahansa merkeistä .-/.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Päiväyksen muoto</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>pp.kk.vvvv</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation>kk/pp/vvvv</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation>vvvv-kk-pp</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Sukellus</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation>Päiväys valitussa muodossa (esim. pp.kk.vvvv)</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Ajankohta</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation>Sukelluksen kesto sekunneissa min:sek muodossa</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Avainsanat</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Kohde</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Suurin syvyys</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Kentän määritys</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Keskisyvyys</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Sukelluspari</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Muistiinpanot</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Painot</translation> </message> @@ -1846,77 +1933,92 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Syvyys</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Kello</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Paine</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Lämpötila</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Väri</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Sensoripaine</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation>Ympäröivä paine</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Arvioitu paine</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Käyttäjän syöttämä</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Säiliöindeksi</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Katto</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>Pintakulutus</translation> </message> @@ -1967,127 +2069,127 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Ajankohta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Yleisarvio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Syvyys</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Lämpötila</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Painot</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>Pintakulutus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Massa(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Puku</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Säiliöt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Kaasu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>Pintakulutus(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Kohde</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Syvyys(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Lämpötila(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2191,54 +2293,54 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Virhe</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Yritä uudestaan</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Etsi Uemis -sukellustietokone</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Valitse lokitiedosto sukellustietokoneen purun tietojen tallennukseen</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Lokitiedostot (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Varoitus</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Kun sukellustietokoneen latauksesta tallennetaan raakatiedosto, sukelluksia EI tallenneta sukelluslistaan.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Valitse tiedosto sukellustietokoneen latauksen raakatiedostolle</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Raakatiedostot (*.bin)</translation> </message> @@ -2311,17 +2413,42 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation>Avain</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Arvo</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2360,17 +2487,17 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation>Laiteohjelmiston päivitys epäonnistui!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation> </message> @@ -2378,7 +2505,7 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Muokkaa valittuja sukelluskohteita</translation> </message> @@ -2386,7 +2513,7 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Sijainti:</translation> </message> @@ -2402,330 +2529,330 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Kohde</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Koordinaatit</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Sukellusvanhin</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Sukelluspari</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Avainsanat</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Yleisarvio</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Näkyvyys</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Puku</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Muistiinpanot</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Ilman lämpötila</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Veden lämpötila</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Muistiinpanot</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Varusteet</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Käytetyt seokset</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Kaasun kulutus</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>Happikertymä (CNS)</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Suurin syvyys</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Ilmanpaine</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Sukellusaika</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Kokonaisaika</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Kaasun kulutus</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation>Lisätiedot</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation>Lisätiedot sukellustietokoneelta</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Ajankohta</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Kello</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Tiedot</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Pinta-aika</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>Pintakulutus</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Keskisyvyys</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>Happikertymä (OTU)</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Suolapitoisuus</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Tilastot</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Syvyys</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Lämpötila</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Sukelluksia</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Valokuvat</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Säiliöt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Painot</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation>Hyväksy muutokset</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation>Hylkää muutokset</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Lisää säiliö</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation>Lisää painojärjestelmä</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Ilman lämpötila [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Veden lämpötila [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Tätä sukellusretkeä muokataan.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Muokataan useita sukelluksia.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Tätä sukellusta muokataan.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Matkan muistiinpanot</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Matkakohde</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Syvin sukellus</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Matalin sukellus</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation>Korkein pintakulutus sukelluksella</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation>Matalin pintakulutus sukelluksella</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation>Keskimääräinen pintakulutus valituilla sukelluksilla</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation>Korkein lämpötila</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation>Matalin lämpötila</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation>Valittujen sukellusten keskilämpötila</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation>Pisin sukellus</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation>Lyhin sukellus</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation>Valittujen sukellusten keskimääräinen kesto</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2734,17 +2861,17 @@ sekoittaa ilmasta ja käyttäen: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>ja</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Hylätäänkö muutokset?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Olet hylkäämässä muutoksesi.</translation> </message> @@ -2752,92 +2879,92 @@ sekoittaa ilmasta ja käyttäen: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>Tiedosto</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation>Sukelluslokin vienti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Näytä/piilota pHe-kuvaaja</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Näytä/piilota kaikkien kudosten laskenta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Näytä/piilota sukellustietokoneen raportoima kattosyvyys</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Näytä/piilota laskettu kattosyvyys</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Näytä/piilota NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Näytä/piilota laskettu kattosyvyys 3m:n tarkkuudella</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Ohjelmoi sukellustietokone</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Suunnittele sukellus uudestaan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Näytä/piilota syke</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>Näytä/piilota MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Näytä/piilota EAD, END sekä EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>Näytä/piilota hengitysnopeus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Näytä/piilota viivain</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Sukellussuunnitelman yksityiskohdat</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Tulosta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2850,486 +2977,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>Loki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>Näkymä</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>Apua</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>Liitä</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>Uusi loki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Uusi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>Avaa loki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Avaa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>Tallenna</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Tallenna</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Tallenna nimellä</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Tallenna nimellä...</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>Sulje</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Sulje</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>Asetukset</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Liitä GPS-tiedot Subsurfacen on-line -palvelusta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>Kopioi sukelluksen osat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>Liitä sukelluksen osat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>Profiilikuvaaja</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>Tiedot</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>Kaikki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>Seuraava tietokone</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>Tietoja Subsurfacesta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>Maapallo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Tuo Divelogs.de -sivustolta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>Kokoruututila</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Käytä kokoruututilaa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>Tarkista päivitykset</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>Vienti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation>Näytä/piilota pO₂ -kaavio</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation>Näytä/piilota pN₂ -kuvaaja</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Muuta kuvasuhdetta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation>Näytä/piilota kuvat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation>Näytä/piilota säiliöpalkki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>Suodata sukelluslista</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation>Näytä/piilota kudoskuvaaja</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>Tulosta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>Lopeta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Hae sukellustietokoneelta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>Uudellennumeroi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>Muokkaa laitenimiä</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>Lisää sukellus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Ryhmittele automaattisesti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>Vuositilastot</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>Sukelluslista</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Edellinen tietokone</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Vasen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Oikea</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>Käyttöohje</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>Sukelluksen suunnittelu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>Liitä lokitiedostoja</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Liitä lokitiedostoja toisesta sovelluksesta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Avaa tiedosto</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Peruuta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Tulosta sukellussuunnitelma</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Tallenna muutokset?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Tallenna nimellä</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Avaa sukellusloki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation>Sukelluslokitiedostot (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran -tiedostot (*.can);;CSV -tiedostot (*.csv);;DiveLog.de -tiedostot (*.dld);;JDiveLog -tiedostot (*.jlb);;Liquivision -tiedosstot (*.lvd);;MkVI -tiedostot (*.txt);;Suunto -tiedostot (*.sde *.db);;UDDF/UDCF -tiedostot (*.uddf *.udcf);;XML -tiedostot (*.xml);;Kaikki tiedostot (*)</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Varoitus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Vuositilastot</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3337,12 +3469,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>Suodin näyttää %1 (%2:sta) sukelluksesta</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3400,388 +3572,403 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Oletukset</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Yksiköt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Kaavio</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Kieli</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Verkko</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Fontti</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Fontin koko</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Sukelluksia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Käytä oletusta</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animaatiot</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Nopeus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Tyhjennä kaikki asetukset</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Palauta kaikki asetukset oletusarvoihin</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Järjestelmä</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metrinen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Brittiläinen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Mukauta</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Syvyys</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>metri</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>jalka</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>litra</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>kuutiojalka</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>Celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>Fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Järjestelmän oletus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Välityspalvelin</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Välityspalvelimen tyyppi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Osoite</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Portti</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Vaatii kirjautumisen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Käyttäjätunnus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Salasana</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Suodattimet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Paine</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Listat ja taulukot</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Oletus lokitiedosto</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Näytä epäkelvot</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Oletussäiliö</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Käytä oletussäiliötä</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurfacen verkkopalvelu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Oletuskäyttäjätunnus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Tallennetaanko käyttäjätunnus paikallisesti?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Tilavuus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Lämpötila</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Painot</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Aikayksiköt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minuuttia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Sekuntia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Näytä</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow maksimisyvyydessä</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Sekalaiset</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Asetukset</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Nousu-/laskunopeuden yksikkö</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Kynnysarvo pO₂:lle</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Kynnysarvo pN₂:lle</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Kynnysarvo pHe:lle</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Maksimi pO₂, kun näytetään MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Näytä sukellustietokoneen raportoima kattosyvyys punaisella</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Näytä käyttämättömät säiliöt varusteluettelossa</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>näytä keskisyvyys</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFhigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Ei välityspalvelinta</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Järjestelmän proxy -asetukset</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Vaaditaan uudelleenkäynnistys</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Uuden kielen lataaminen vaatii Subsurfacen uudelleenkäynnistyksen </translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Jos valitset hyväksynnän, kaikki Subsurfacen asetukset palautetaan oletusarvoihin. Muutos tulee käyttöön välittömästi.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Avaa oletustiedosto</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Varoitus</translation> </message> @@ -3908,72 +4095,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>tuntematon</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Sukellus #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Suurin syvyys: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Kesto: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Kaasun kulutus:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Avainsanat:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>Pintakulutus:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Painot:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Muistiinpanot:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Sukellusvanhin:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Sukelluspari:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Puku:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Näkyvyys:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Yleisarvio:</translation> </message> @@ -3981,103 +4168,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 / %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Suoranousu-/pintautumisaikaa ei näytetä, koska niiden laskemiseen kuluu liikaa aikaa</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Aseta ensisijaiseksi sukellustietokoneeksi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Poista tämä sukellustietokone</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Lisää kaasun vaihto</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation>(Säiliö %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation>Aseta setpointin vaihto</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Lisää kirjanmerkki</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Poista tapahtuma</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Piilota samankaltaiset tapahtumat</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Muokkaa nimeä</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <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="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Näytä kaikki tapahtumat</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Piilota tapahtumat</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Piilota kaikki %1 tapahtumat</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Poistetaanko valitut tapahtumat?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Muokkaa kirjanmerkin nimeä</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Valinnainen nimi:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Nimi on liian pitkä!</translation> </message> @@ -4105,22 +4292,22 @@ p, li { white-space: pre-wrap; } <translation>Sulje</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Keskim.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Alin</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Korkein</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Kaksoisnäpäytä karttaa valitaksesi sukelluskohteen</translation> </message> @@ -4188,12 +4375,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation> </message> @@ -4207,12 +4394,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Uusi aloitusnumero</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Uusi numero</translation> </message> @@ -4220,12 +4407,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation> </message> @@ -4304,12 +4491,12 @@ p, li { white-space: pre-wrap; } <translation>Mikä päivä ja aika näkyy kuvassa?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Avaa kuvatiedosto</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Kuvatiedostot (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4359,6 +4546,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4382,8 +4683,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Sukelluslokiohjelmisto useille käyttöjärjestelmäalustoille<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4437,7 +4738,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Puvut:</translation> </message> @@ -4453,11 +4754,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Lisää säiliö</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4467,7 +4763,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Avainsanat:</translation> </message> @@ -4517,54 +4813,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Tarkista päivitykset.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Päivitysten tarkistus epäonnistui.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Tapahtui seuraava virhe:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Tarkista Internetyhteys.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation>Käytössä on uusin versio Subsurfacesta.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Saatavilla on uusi versio Subsurfacesta.<br/>Näpäytä:<br/><a href="%1">%1</a><br/> ladataksesi sen.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation>Saatavilla on uusi versio Subsurfacesta.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation>Uusin versio on %1, tarkista päivityksen saatavuus käyttöjärjestelmäsi valmistajlata.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation>Uusin julkaistu versio on</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Päivitysten tarkastuksssa tapahtui virhe.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4584,64 +4900,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Haluaisimme tietää enemmän käyttäjistämme, heidän asetuksistaan ja tyypillisestä Subsurfacen käytöstä. Voisitko täyttää tämän lomakkeen ja lähettää sen Subsurfacen kehittäjille. Ole hyvä ja merkitse kaikki itsellesi sopivat valinnat.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Käyttäjäkysely</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Subsurfacen käyttäjäkysely</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Harrastesukeltaja</translation> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Tekniikkasukeltaja</translation> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Sukellussuunnitelmat kiinnostavat</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Lataan sukelluksia tuetulta sukellustietokoneelta</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Tuon sukelluksia muusta sovelluksesta / lähteestä</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Syötän sukellukset käsin</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Käytän Android -sovellusta sukellusten sijainnin seurantaan</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Ole hyvä ja kirjoita ehdotuksesi (mielellään englanniksi) seuraavaan tekstikenttään</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Järjestelmästäsi lähetetään myös seuraavat tiedot</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4813,12 +5139,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation> </message> @@ -4826,79 +5159,79 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Vuosi > Kuukausi / Retki</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Kesto Kokonais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Keskim.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Lyhin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Pisin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Dyvyys (%1) Keski</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Alin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Suurin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Keski</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Lämpö (%1) @@ -4914,13 +5247,13 @@ Keski</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4931,16 +5264,16 @@ Keski</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4966,120 +5299,120 @@ Keski</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>pauna</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) tai (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>ilma</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integroitu</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>vyöpaino</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>nilkkapaino</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>selkäpaino</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Tiedoston '%s' avaaminen epäonnistui</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>CSV -tiedoston %s avaus epäonnistui; käytä Tuonti -dialogia</translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon -tuonti epäonnistui: tiedoston '%2' luku epäonnistui</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation>Suukappaleen asema (avoin kierto)</translation> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation>Suukappaleen asento (suljettu kierto)</translation> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation>Suukappaleen asento tuntematon</translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation>Suukappale ei kytketty</translation> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation>Sammuta</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation>Happikalibrointi epäonnistui</translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation>Happikalibrointi</translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation>Vastaavaa sukellustietokonetta tiedostolle '%s' ei löytynyt</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksimimäärä sarakkeita CSV -tuonnissa on %d</translation> </message> @@ -5098,7 +5431,7 @@ Keski</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation>paristo</translation> </message> @@ -5112,7 +5445,7 @@ Keski</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>nousu</translation> @@ -5159,7 +5492,7 @@ Keski</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5315,42 +5648,42 @@ Keski</translation> <translation>Virhe näytteiden tulkinnassa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Tapahtuma: odotetaan käyttäjän toimia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Virhe sukellusten jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>libdivecomputer-kontekstin luominen epäonnistui</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Avaaminen epäonnistui: %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Käyttövaltuudet eivät riitä laitteen %s %s (%s) avaamiseen</translation> </message> @@ -5369,224 +5702,256 @@ Keski</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Tietokantakysely 'get_events' (nouda tapahtumat) epäonnistui. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Tietokantakysely 'get_tags' epäonnistui. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Tietokantayhteys epäonnistui '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Tietokantakysely epäonnistui '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Tietokantakysely 'get_cylinders' epäonnistui. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. </source> - <translation>Tietokantakysely 'get_changes' epäonnistui. + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Tietokantayhteys epäonnistui '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Tietokantakysely 'get_profile_sample' epäonnistui. + <translation>Tietokantakysely epäonnistui '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Tyylitiedoston %1 avaus ei onnistu</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Seosta %s ei löydy</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Liian monta kaasuseosta</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Dekon laskeminen on keskeytetty kohtuuttoman keston vuoksi</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>perustuu arvoihin GFlow = %d ja GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurfacen sukellussuunnitelma</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>syvyys</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>sukellusaika</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>kesto</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>kaasu</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <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="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <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="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3d min</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Vaihda kaasu seuraavaan %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Vaihda kaasu seuraavaan: %s </translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>Happikertymä (CNS)</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>Happikertymä (OTU)</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Kaasun kulutus (CCR -etappeja ei mukana):</translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Kaasun kulutus: </translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Varoitus:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>VAROITUS: BUHLMANNIN ALGORITMIN TOTEUTUS JA SIIHEN PERUSTUVA SUKELLUSTEN SUUNNITTELUOMINAISUUS OVAT UUSIA, JOTEN NIITÄ ON TESTATTU VAIN RAJALLISESTI. SUKELLUKSIA SUUNNITELTAESSA EI TULE LUOTTAA VAIN NÄIHIN TULOKSIIN.</translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <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="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <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="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s / %s (%.0f%s/%.0f%s suunnitellussa nousussa)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s suunnitellun nousun aikana) / %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5595,70 +5960,70 @@ S: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>L: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>N: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5667,7 +6032,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5676,161 +6041,167 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Turvapysähdys: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Turvapysähdys: ajankohta? @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: ajankohta? @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>Dekossa</translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (lask.) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>Dekossa (lask.) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Laskettu katto %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Kudos %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>syke: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>suunta: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sA: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sS:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sS:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sN:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sN:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1kuu %2 (%3 sukellusta)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1kuu %2 (1 sukellus)</translation> </message> @@ -5995,97 +6366,97 @@ EADD: %d%s <translation>(ei sukelluksia)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>su</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>ma</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>ti</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>ke</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>to</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>pe</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>la</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>tammi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>helmi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>maalis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>huhti</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>touko</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>kesä</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>heinä</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>elo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>syys</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>loka</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>marras</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>joulu</translation> </message> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 8c27c5736..2f9e3e407 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Personne : </translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>Recherches d'équipiers et de moniteurs</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Impossible de sauvegarder le fichier de sauvegarde %1. Message d'erreur : %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Impossible d'ouvrir le fichier de sauvegarde : %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation>Succès de la lecture des détail de l'ordinateur de plongée</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Paramètre correctement envoyé à l'ordinateur</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Le firmware de l'ordinateur a été mis à jour avec succès</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Les paramètres de l'ordinateur ont été remis à zéro avec succès</translation> </message> @@ -847,72 +847,72 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Sauvegarder les fichiers (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>Une erreur s'est produite lors de l'enregistrement du fichier de sauvegarde. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Sauvegarde réussie</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>Vos paramètres ont été enregistrés vers : %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation>Sauvegarder les paramètres de l'ordinateur de plongée</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation>Erreur de sauvegarde XML</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation>Restaurer les paramètres de l'ordinateur de plongée</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation>Erreur de restauration XML</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Une erreur s'est produite lors de la restauration du fichier de sauvegarde. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>La restauration a réussi</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>Vos paramètres ont été restaurés avec succès.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Sélectionner le fichier de firmware</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>Tous les fichiers (*.*)</translation> </message> @@ -1071,22 +1071,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Modèle</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>ID du périphérique</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Nom</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Cliquer ici retirera cet ordinateur</translation> </message> @@ -1094,18 +1094,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Passer en CO</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation> début</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation> fin</translation> @@ -1114,97 +1114,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Évaluation</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Profondeur(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>pied</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Température(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Poids(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>livre US</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Combinaison</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Bloc</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>Consommation d'air(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>SNC max</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Lieu</translation> </message> @@ -1212,87 +1212,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Tout déplier</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Tout replier</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Replier les autres</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Supprimer la (les) plongée(s) du voyage</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Créer un nouveau voyage au-dessus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <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="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <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="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Fusionner le voyage avec le voyage du dessus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Fusionner le groupe avec le voyage du dessous</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Effacer la (les) plongée(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Marquer la (les) plongée(s) comme invalides</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Fusionner les plongées sélectionnées</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Renuméroter la (les) plongée(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Décaler l'heure</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Charger les images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Ouvrir les fichiers images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Fichier image (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1300,54 +1300,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Format d'export</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>XML Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Mappemonde</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Sélection</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Plongées sélectionnées</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Toutes les plongées</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1362,108 +1357,134 @@ <translation>Export général</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation>DiveShare</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation>Profondeurs d'image</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Préférences générales</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Numéros Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation>Exporter les statistiques annuelles </translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Export de liste uniquement</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Options de style</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Police</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Taille de police</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Thème</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Clair</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Sable</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Fichiers UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>Fichiers CSV (*.csv *.CSV)</translation> </message> @@ -1474,77 +1495,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Valeurs séparées par des virgules, qui incluent les informations les plus pertinentes du profil de plongée.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Envoyer les données de la plongée au site divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation>Envoyer les informations des plongées au site dive-share.appspot.com</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Export HTML des lieux de plongées, indiqués sur une carte du monde</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Format XML natif de Subsurface.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation>Sauvegarder les profondeurs des images dans le fichier.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Exporter le fichier UDDF en</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Exporter le fichier CSV en</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Exporter la carte mondiale</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>Fichiers HTML (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Exporter vers fichier XML Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>Fichiers XML (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation>Sauvegarder la profondeur de l'image</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Exporter le fichier HTML comme</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Impossible d'ouvrir le fichier %s</translation> </message> @@ -1583,7 +1610,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Heure</translation> </message> @@ -1609,25 +1636,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Séparateur de champs</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Unités</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Métrique</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Impérial</translation> </message> @@ -1642,100 +1669,160 @@ <translation>Plongées manuelle</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation>Choisissez l'ordre des jours, mois et années pour le format de la date. Le séparateur de champ peut être un des caractères suivant .-/.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Format de date</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>jj.mm.aaaa</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation>mm/jj/aaaa</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation>aaaa-mm-jj</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Plongée n°</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation>Date au format jj.mm.aaaa, aaaa-mm-jj ou mm/jj/aaaa</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation>Durée de plongée en secondes ou en min:sec</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Étiquettes</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Lieu</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Profondeur max.</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Configuration des champs</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Prof. moyenne</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Équipier</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Poids</translation> </message> @@ -1847,77 +1934,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Profondeur</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Heure</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Pression</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Température</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Couleur</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Pression S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation>Pression ambiante</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Pression I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Entré par l'utilisateur</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Index du bloc</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Plafond</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>Consommation d'air</translation> </message> @@ -1968,127 +2070,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Évaluation</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Profondeur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Poids</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>Consommation d'air</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>pied</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Poids(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Combinaison</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Bloc</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>Consommation d'air(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>SNC max</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Lieu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Profondeur(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Température(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>livre US</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2192,54 +2294,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Essayer à nouveau</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Trouver l'ordinateur de plongée Uemis</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Choisir le fichier pour le téléchargement du fichier log de l'ordinateur de plongée</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Fichier de log (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Sauvegarder les données brutes de libdivecomputer NE téléchargera PAS les plongées dans la liste des plongées.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Choisir le fichier pour les données brutes binaires de libdivecomputer</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Fichiers de données brutes (*.bin)</translation> </message> @@ -2312,17 +2414,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation>Clé</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Valeur</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2361,17 +2488,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Cette fonctionnalité n'est pas disponible pour l'ordinateur de plongé sélectionné</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation>La mise à jour du firmware à échoué !</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>Impossible de se connecter à l'ordinateur de plongée.</translation> </message> @@ -2379,7 +2506,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Modifier les lieux de plongée sélectionnés</translation> </message> @@ -2387,7 +2514,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Lieu : </translation> </message> @@ -2403,330 +2530,330 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Lieu</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Coordonnées</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Moniteur / Guide de palanquée</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Équipier</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Étiquettes</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Évaluation</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Visibilité</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Combinaison</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Notes de plongée</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Temp. de l'air</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Temp. de l'eau</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Équipement</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Gaz utilisés</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Gaz consommé</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>SNC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Prof. Max.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Pression de l'air</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Durée de plongée</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Durée totale</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Consommation de gaz</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation>Donnée supplémentaires</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation>Donnée supplémentaires de l'ordinateur de plongée</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Heure</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Info de plongée</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Intervalle</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>Consommation d'air (SAC)</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Prof. moyenne</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Salinité</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Stats</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Profondeur</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Température</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Plongées</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Photos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Blocs</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Poids</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation>Appliquer les modifications</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation>Annuler les modifications</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Ajouter un bloc</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation>Ajouter un système de poids</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Temp. de l'air. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Temp. de l'eau. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Ce voyage est en cours d'édition.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Plusieurs plongées sont en cours d'édition.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Cette plongée est en cours d'édition.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Notes de voyage</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Lieu du voyage</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Plongée la plus profonde</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Plongée la moins profonde</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation>Consommation d'air (SAC) maximale d'une plongée</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation>Consommation d'air (SAC) minimale d'une plongée</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation>Consommation d'air (SAC) moyenne des plongée sélectionnées</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation>Température maximale</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation>Température minimale</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation>Température moyenne des plongées sélectionnées</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation>Plongée la plus longue</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation>Plongée la plus courte</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation>Durée moyenne des plongées sélectionnées</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2735,17 +2862,17 @@ mélangés à partir de l'air et en utilisant : </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation> et </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Abandonner les modifications ?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Vous perdrez les modifications non enregistrées.</translation> </message> @@ -2753,92 +2880,92 @@ mélangés à partir de l'air et en utilisant : <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&Fichier</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation>Exporter les plongées</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Commuter le graphique de la pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Commuter le calcul de tous les tissus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Commuter le plafond rapporté par l'ordinateur de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Commuter le plafond calculé</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Commuter LND, DTR</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Commuter le plafond calculé avec des incréments de 3m</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Configurer l'&ordinateur de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Replanifier la &plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Commuter le rythme cardiaque</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>Commuter la MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Commuter PEA, PEEA, PEDA</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>Commuter la consommation d'air (SAC)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Commuter la règle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Détails du plan de plongée</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Imprimer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2851,486 +2978,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Journal</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Vue</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Aide</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Importer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Nouveau carnet de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Nouveau</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Ouvrir un carnet de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Ouvrir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Sauvegarder</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Sauvegarder</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Enre&gistrer sous</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Enregistrer sous</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Maj+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>&Fermer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Fermer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>P&références</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importer les données &GPS depuis le service web Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>&Copier les composants de la plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>C&oller les composants de la plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>&Tout</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>Ordi&nateur suivant</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>&A propos de Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>&Globe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Importer &depuis divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>&Plein écran</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Commuter en mode plein écran</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>&Vérifier les mises à jour</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>&Exporter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation>Commuter le graphique de la pO₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation>Commuter le graphique de la pN₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Ajuster l'échelle du graphique </translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation>Commuter l'affichage des images</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation>Commuter l'affichage des blocs</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>&Filtrer la liste des plongées</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation>Commuter le graphique des tissus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Imprimer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&Quitter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Importer depuis l'&ordinateur de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Renuméroter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>&Éditer les noms des ordinateurs de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>&Ajouter une plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>&Grouper automatiquement</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>&Statistiques annuelles</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>&Liste des plongées</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Ordinateur P&récédent</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Gauche</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Droite</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>&Manuel utilisateur</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>P&lanifier une plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>&Importer des fichiers de log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Importer les fichiers de plongées depuis d'autres applications</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Ouvrir un fichier</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Annuler</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Imprimer le tableau de runtime</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Enregistrer les modifications ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Enregistrer le fichier sous</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Ouvrir le fichier de carnet de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation>Fichier Dive log (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Fichiers Cochran (*.can);;Fichiers CSV (*.csv);;Fichier DiveLog.de (*.dld);;Fichiers JDiveLog (*.jlb);;Fichiers Liquivision (*.lvd);;Fichiers MkVI (*.txt);;Fichiers Suunto (*.sde *.db);;Fichiers UDDF/UDCF (*.uddf *.udcf);;Fichiers XML (*.xml);;Tous les fichiers (*)</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Statistiques annuelles</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3338,12 +3470,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>Le Filtre affiche %1 (de %2) plongées</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3401,387 +3573,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Valeurs par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Unités</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Graphique</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Langue</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Réseau</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Police</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Taille de police</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Plongées</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Utiliser les paramètres par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animations</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Vitesse</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Supprimer tous les paramètres</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Remettre tous les paramètres à leur valeur par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Système</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Métrique</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Impérial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personnalisé</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Profondeur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>mètre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>pieds</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>litre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>pied³</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Paramètre système par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Type de proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Hôte</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Requiert une authentification</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Nom d'utilisateur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Mot de passe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filtre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Pression</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Listes et tableaux</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Carnet de plongée par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Afficher les plongées invalides</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Bloc par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Utiliser le bloc par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Service web de Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>ID utilisateur par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Sauvegarder l'ID utilisateur localement ?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Température</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Poids</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>livre US</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Unités de temps</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minutes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Secondes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Afficher</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow à la profondeur max</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Divers</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Préférences</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Dénominateur de vitesse de remontée/descente</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Seuil d'affichage pour la pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Seuil d'affichage pour la pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Seuil d'affichage pour la pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>pO₂ max pour l'affichage de la MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Afficher en rouge le plafond signalé par l'ordinateur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Afficher les blocs non utilisés dans l'onglet des Équipements</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Afficher la profondeur moyenne</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Sans proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Proxy système</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>Proxy HTTP</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Redémarrage nécessaire</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Vous devez redémarrer Subsurface pour prendre en compte la nouvelle langue.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Si vous cliquez sur OK, tous les paramètres de Subsurface vont être remis à leur valeur par défaut. Cela s'appliquera immédiatement.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Ouvrir le carnet de plongée par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Avertissement</translation> </message> @@ -3908,72 +4095,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Plongée n°%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Profondeur max : %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Durée : %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Gaz utilisé :</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Étiquettes :</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>Consommation d'air (SAC) :</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Poids :</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Notes :</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Moniteur / Guide de palanquée :</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Équipier :</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Combinaison :</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Visi :</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Évaluation :</translation> </message> @@ -3981,103 +4168,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (n°%1 sur %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>L'affichage de la LND/DTR est désactivée à cause d'un temps de calcul excessif</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Définir comme ordinateur de plongée principal</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Supprimer cet ordinateur de plongée</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Ajouter un changement de gaz</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation> (Bloc %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Ajouter un signet</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Supprimer l'évènement</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Masquer les évènements similaires</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Modifier le nom</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <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="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Afficher tous les évènements</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Masquer les évènements</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Masquer tous les évènements %1 ?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Supprimer l'évènement sélectionné ?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Modifier le nom du signet</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Nom personnalisé :</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Le nom est trop long !</translation> </message> @@ -4105,22 +4292,22 @@ p, li { white-space: pre-wrap; } <translation>Fermer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Moyenne</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Maximum</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Déplacez la carte et double cliquez pour définir le lieu de la plongée</translation> </message> @@ -4188,12 +4375,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Cette fonctionnalité n'est pas disponible pour l'ordinateur de plongé sélectionné.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>Impossible de se connecter à l'ordinateur de plongée.</translation> </message> @@ -4207,12 +4394,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Nouveau numéro de départ</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Nouveau numéro</translation> </message> @@ -4220,12 +4407,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Cette fonctionnalité n'est pas disponible pour l'ordinateur de plongé sélectionné.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>Impossible de se connecter à l'ordinateur de plongée.</translation> </message> @@ -4304,12 +4491,12 @@ p, li { white-space: pre-wrap; } <translation>Quelle est l'heure et la date affiché par l'image ?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Ouvrir un fichier image</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Fichiers image (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4359,6 +4546,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4382,8 +4683,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Logiciel multiplateforme de carnet de plongée<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, et autres, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4437,7 +4738,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Combinaisons : </translation> </message> @@ -4453,11 +4754,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Ajouter un bloc</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4467,7 +4763,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Étiquettes : </translation> </message> @@ -4517,54 +4813,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Vérifier les mises à jour.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface n'a pas été en mesure de vérifier les mises à jour.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>L'erreur suivante est apparue :</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Vérifiez votre connexion Internet.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation>Vous utilisez la dernière version de Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Une nouvelle version de Subsurface est disponible.<br/>Téléchargez-là sur :<br/><a href="%1">%1</a><br/></translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation>Une nouvelle version de Subsurface est disponible.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation>La dernière version est %1, renseignez-vous auprès de votre fournisseur pour d'éventuelles mises à jour.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation>La version la plus récente est </translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Il y a eu une erreur lors de la recherche des mises à jours.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4584,64 +4900,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Nous désirons en connaître d'avantage sur nos utilisateurs, leurs préférences, et leurs habitudes d'utilisations. Merci de prendre une minute pour remplir ce formulaire et le soumettre à l'équipe de Subsurface. Merci de sélectionner toutes les options qui s'appliquent à vous.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Sondage utilisateur</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Sondage utilisateur Subsurface</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Plongeur loisir</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Plongeur technique</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Intéressé par la planification de plongée</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Je télécharge les plongées depuis un ordinateur de plongée supporté</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>J'importe les plongées depuis d'autres logiciels / sources</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>J'entre les plongées manuellement</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>J'utilise l'application Compagnon Android pour localiser mes plongées</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Entrez vos éventuelles suggestions (en anglais) dans le cadre suivant</translation> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Les informations systèmes suivantes seront également soumises</translation> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4815,12 +5141,19 @@ Architecture OS CPU : %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Cette fonctionnalité n'est pas disponible pour l'ordinateur de plongé sélectionné.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>Impossible de se connecter à l'ordinateur de plongée.</translation> </message> @@ -4828,79 +5161,79 @@ Architecture OS CPU : %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Année > Mois / Voyage</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Durée Totale</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> La plus courte</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> La plus longue</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Profondeur (%1) Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>Consommation d'air (SAC) (%1) Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4916,13 +5249,13 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4933,16 +5266,16 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>pieds</translation> </message> @@ -4968,120 +5301,120 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>livre US</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>air</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>intégré</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>ceinture</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>cheville</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>poids dorsaux</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Impossible de lire '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>Impossible d'ouvrir le fichier CSV %s ; veuillez utiliser le dialogue d'Import de fichier journal</translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>L'import Poseidon a échoué : impossible de lire '%s'</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation>Embout de position inconnu</translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation>Embout de position non connecté</translation> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation>Éteindre</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation>Échec de la calibration O₂</translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation>Calibration O₂</translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation>Pas trouvé d'ordinateur de plongée pour le fichier '%s'</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Le nombre maximum de colonnes supporté pour les importations de fichiers CSV est %d</translation> </message> @@ -5100,7 +5433,7 @@ Maximum</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation>Batterie</translation> </message> @@ -5114,7 +5447,7 @@ Maximum</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>remontée</translation> @@ -5161,7 +5494,7 @@ Maximum</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5317,42 +5650,42 @@ Maximum</translation> <translation>Erreur d'analyse des échantillons</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Évènement : attente d'une action de l'utilisateur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modèle = %u (0x%08x), firmware = %u (0x%08x), numéro de série = %u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Erreur d'enregistrement du gestionnaire d'évènements.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Erreur d'enregistrement du gestionnaire d'annulation.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Erreur d'import des données de plongées</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Impossible de créer un contexte libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Impossible d'ouvrir %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Privilèges insuffisants pour ouvrir le périphérique %s %s (%s)</translation> </message> @@ -5371,222 +5704,254 @@ Maximum</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Échec de la requête de base de données get_events. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Échec de la requête de base de données get_tags. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Connexion à la base de données impossible '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Échec de la requête de base de données '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Échec de la requête de base de données get_cylinders. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. </source> - <translation>Échec de la requête de base de données get_changes. + <translation>Connexion à la base de données impossible '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Échec de la requête de base de données get_profile_sample. + <translation>Échec de la requête de base de données '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Impossible d'ouvrir le feuille de style %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>Nitrox%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Impossible de trouver le gaz %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Trop de gaz différents</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Calcul de la décompression annulé à cause d'une durée excessive</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>Basé sur GFlow = %d et GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Planification de plongée Subsurface</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>profondeur</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>durée</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>gaz</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Transition de %.*f %s en %d:%02d min - runtime %d:%02u sur %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transition de %.*f %s en %d:%02d min - runtime %d:%02u sur %s</translation> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Rester à %.*f %s pendant %d:%02d min - runtime %d:%02u sur %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Rester à %.*f %s pendant %d:%02d min - runtime %d:%02u sur %s</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Changer de gaz vers %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Changer de gaz vers %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>SNC</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consommation de gaz (segments CCR exclus) :</translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Consommation de gaz :</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Avertissement :</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>DISCLAIMER / ATTENTION : CECI EST UNE NOUVELLE IMPLÉMENTATION DE L'ALGORITHME DE BÜHLMANN ET SON ADAPTATION DANS UN PLANIFICATEUR DE PLONGÉE QUI N'A ÉTÉ TESTÉ QUE SOMMAIREMENT. NOUS VOUS RECOMMANDONS FORTEMENT DE NE PAS PLANIFIER VOS PLONGÉES EN NE VOUS BASANT QUE SUR LES RÉSULTATS PROPOSÉS ICI.</translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation>C'est plus de gaz que ce qui est disponible dans le bloc spécifié !</translation> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>pas assez de gaz en réserve pour un échange lors de la remontée !</translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s dans la remontée planifiée)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durant la remontée planifiée) de %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valeur pO₂ haute %.2f à %d:%02u avec le gaz %s à la profondeur %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>nitrox</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5595,70 +5960,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>Consommation d'air en surface (SAC) : %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>SNC : %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD : %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5667,7 +6032,7 @@ PEDA : %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5676,70 +6041,70 @@ PEDA : %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Palier de sécurité : %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Palier de sécurité : temps inconnu @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Déco : %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Déco : temps inconnu @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>En déco </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>LND : %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>DTR : %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Déco : %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>En déco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>LND : %umin (calc) @@ -5747,92 +6112,98 @@ PEDA : %d%s </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>DTR : %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Plafond calculé %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tissus %.0fmin : %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>rythme cardiaque : %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>palier : %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sPd:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sPd:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 plongées)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 plongée)</translation> </message> @@ -5997,97 +6368,97 @@ PEDA : %d%s <translation>(pas de plongées)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Dim.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Lun.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Mar.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Mer.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Jeu.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Ven.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Sam.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Janv.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Fév.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mar.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Avril</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Juin</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Juil.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Août</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Sept.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Oct.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Nov.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Déc.</translation> </message> diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index b427903f9..e81777065 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1068,22 +1068,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>דגם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>מזהה התקן</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>כינוי</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"/> </message> @@ -1091,18 +1091,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>מעבר חרום למערכת נשימה פתוחה</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>להתחיל</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>סוף</translation> @@ -1111,97 +1111,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>תאריך</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>דירוג</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>ליברה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>חליפה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>לדקה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>מיקום</translation> </message> @@ -1209,87 +1209,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1297,54 +1297,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation type="unfinished"/> </message> @@ -1359,107 +1354,133 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>גופן</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>גודל גופן</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF קבצי (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation type="unfinished"/> </message> @@ -1470,77 +1491,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> + <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> - <source>Send the dive data to divelogs.de website.</source> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> - <source>Send the dive data to dive-share.appspot.com website</source> + <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> - <source>HTML export of the dive locations, visualized on a world map.</source> + <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> - <source>Subsurface native XML format.</source> + <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <source>Subsurface native XML format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>קבצי HTML (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> @@ -1579,7 +1606,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>זמן</translation> </message> @@ -1605,25 +1632,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>יחידות</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>מידה</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>אמריקאית</translation> </message> @@ -1638,100 +1665,160 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>תאריך</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>תגיות</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>מיקום</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>בן זוג</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>הערות</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>משקל</translation> </message> @@ -1843,77 +1930,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>עומק</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>זמן</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>לחץ</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>טמפרטורה</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>לחץ הליום</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>צריכת אויר</translation> </message> @@ -1964,127 +2066,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>תאריך</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>דירוג</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>עומק</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>טמפ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>משקל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>צריכת אויר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>חליפה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>לדקה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>מיקום</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>ליברה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2188,54 +2290,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>אשר</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>שגיאה</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>נסה שוב</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>קבצי יומן (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>אזהרה</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>קבצי Dump (*.bin)</translation> </message> @@ -2308,17 +2410,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2357,17 +2484,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2375,7 +2502,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation type="unfinished"/> </message> @@ -2383,7 +2510,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2399,347 +2526,347 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>מיקום</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>קואורדינטות</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>מדריך צלילה</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>בן זוג</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>תגיות</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>דירוג</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>ראות</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>חליפה</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>הערות</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>ציוד</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>תאריך</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>זמן</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>משך</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>צריכת אויר</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>מליחות</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>סטטסטיקות</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>עומק</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>טמפרטורה</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>צלילות</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>מיכלים</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>משקולות</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>צלילות מרובות בעריכה.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>צלילה זו בעריכה.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>לדקה</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2747,92 +2874,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&קובץ</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>צריכת אויר</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>הדפס</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2841,486 +2968,491 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&יומן</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&עזרה</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&ייבא</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>יומן &חדש</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>חדש</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&לפתוח יומן</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>פתח</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&שמור</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>שמור</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>שמור בשם</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>&סגור</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>סגור</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&הדפס</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&צא</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&מספר מחדש</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>שמאל</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>ימין</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>בטל</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני סגירת הקובץ.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני שאתה מנסה להוסיף צלילה.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <source>Changes will be lost if you don't save them.</source> <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>אזהרה</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני פתיחת קובץ חדש.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>קבצי XML נתמכים (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3328,12 +3460,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3391,387 +3563,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>ברירות מחדל</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>יחידות</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>גרף</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>שפה</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>גופן</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>גודל גופן</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>צלילות</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>אנימציות</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>מהירות</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>מערכת</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>מידה</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>אמריקאית</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>התאמה אישית</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>עומק</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>מטר</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>ליטר</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>רגל מ"ק</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>צלסיוס</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>פרנהייט</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>סיסמא</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>פילטר</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>לחץ</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>נפח</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>טמפרטורה</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>משקל</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>יחידות זמן</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>דקות</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>שניות</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>הצג</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>שונות</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>העדפות</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>גרדיאנט תחתון</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>גרדיאנט עליון</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>נדרשת הפעלה מחדש</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>כדי לטעון שפה חדשה בצורה נכונה עליך להפעיל מחדש את Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>קבצי XML נתמכים (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>אזהרה</translation> </message> @@ -3898,72 +4085,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>לא ידוע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>צלילות מס %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>עומק מקסימלי: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>זמן: %1 דקות</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>צריכת אויר:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>משקולות:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>הערות:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>מדריך צלילה:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>בן זוג:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>חליפה:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>ראות:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>דירוג</translation> </message> @@ -3971,103 +4158,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>הסתר אירועים דומים</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>חשוף את כל האירועים</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>הסתר אירועים</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>הסתר את כל %1 האירועים</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>הסר את האירוע שנבחרו?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4095,22 +4282,22 @@ p, li { white-space: pre-wrap; } <translation>סגור</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>ממוצע</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>מינימום</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>מקסימום</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>תזיז את המפה ולחץ לחיצה כפולה כדי לקבוע את מיקום הצלילה</translation> </message> @@ -4178,12 +4365,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4197,12 +4384,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>מספר התחלתי חדש</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4210,12 +4397,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4294,12 +4481,12 @@ p, li { white-space: pre-wrap; } <translation>איזה תאריך ושעה מוצגים בתמונה?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -4349,6 +4536,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4372,7 +4673,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> <translation type="unfinished"/> </message> </context> @@ -4427,7 +4728,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -4443,11 +4744,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4457,7 +4753,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4507,53 +4803,73 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> <translation type="unfinished"/> </message> </context> @@ -4574,63 +4890,73 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> + <location filename="../qt-ui/usersurvey.ui" line="14"/> + <source>User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="14"/> - <source>User Survey</source> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> <message> @@ -4800,12 +5126,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4813,79 +5146,79 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>שנה > חודש / טיול</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>משך כולל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> ממוצע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> קצר ביותר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> ארוך ביותר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>עומק (%1) ממוצע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> מינימום</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> מקסימום</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>צריכת אויר (%1) ממוצע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>טמפ' (%1) @@ -4901,13 +5234,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4918,16 +5251,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>מטר</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>רגל</translation> </message> @@ -4953,120 +5286,120 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%S) או (%S)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>אוויר</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>איטגרל</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>חגורה</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>קרסול</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>משקל פלטת גב</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>נצמד</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>קריאה מ'%S' נכשלה</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -5085,7 +5418,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5099,7 +5432,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>עליה</translation> @@ -5146,7 +5479,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5302,42 +5635,42 @@ Maximum</source> <translation>שגיאה בקריאת נקודות דגימה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>אירוע: מחכה לפעולה של המשתמש</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>דגם=%u (0x%08x), הקושחה=%u (0x%08x), מספר סידורי=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>שגיאה ברישום שגרת ניהול</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>שגיאת יבוא נתוני צלילה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>לא ניתן לפתוח את %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5355,434 +5688,476 @@ Maximum</source> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>שאילתת מסד נתונים של Get_events נכשל -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>החיבור למסד הנתונים נכשל '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>שאילתת מסד נתונים נכשל '%s'. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>החיבור למסד הנתונים נכשל '%s'. +</translation> + </message> + <message> + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. +</source> + <translation>שאילתת מסד נתונים נכשל '%s'. +</translation> + </message> + <message> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>לא ניתן לפתוח את גיליון העיצוב %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>רעילות שייורית מקסימלית %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>פעימות לב %d</translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 צלילות)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 צלילה)</translation> </message> @@ -5947,97 +6322,97 @@ EADD: %d%s <translation>(שום צלילות)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>ראשון</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>שני</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>שלישי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>רביעי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>חמישי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>שישי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>שבת</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>ינואר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>פבואר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>מרץ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>אפריל</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>מאי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>יוני</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>יולי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>אוגוסט</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>ספטמבר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>אוקטובר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>נובמבר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>דצמבר</translation> </message> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index 25449efbf..493e872e5 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1068,22 +1068,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Naziv uređaja</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"/> </message> @@ -1091,18 +1091,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Neplanirani prelazak na OC sustav</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation> započni</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation> završi</translation> @@ -1111,97 +1111,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Ocjena</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Odijelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Boca</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Lokacija</translation> </message> @@ -1209,87 +1209,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Otvori sve</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Zatvori sve grupe</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Kreiraj novu grupu iznad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Spoji s grupom iznad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Spoji s grupom ispod</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1297,54 +1297,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation type="unfinished"/> </message> @@ -1359,107 +1354,133 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation type="unfinished"/> </message> @@ -1470,77 +1491,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> + <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> - <source>Send the dive data to divelogs.de website.</source> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> - <source>Send the dive data to dive-share.appspot.com website</source> + <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> - <source>HTML export of the dive locations, visualized on a world map.</source> + <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> - <source>Subsurface native XML format.</source> + <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <source>Subsurface native XML format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> @@ -1579,7 +1606,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Vrijeme</translation> </message> @@ -1605,25 +1632,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Jedinice</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation type="unfinished"/> </message> @@ -1638,100 +1665,160 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Lokacija</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Bilješke</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Težina</translation> </message> @@ -1843,77 +1930,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Dubina</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Vrijeme</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Pritisak</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1964,127 +2066,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Ocjena</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Dubina</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Težina</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Odijelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Boca</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Lokacija</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2187,54 +2289,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Greška</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Pokušaj ponovo</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation type="unfinished"/> </message> @@ -2307,17 +2409,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2356,17 +2483,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2374,7 +2501,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation type="unfinished"/> </message> @@ -2382,7 +2509,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2398,347 +2525,347 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Lokacija</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Voditelj</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Ocjena</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Vidljivost</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Odijelo</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Bilješke</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Oprema</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Vrijeme</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Statistike</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Dubina</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Uroni</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Boce</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2746,92 +2873,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2840,486 +2967,491 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Novi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Spremi kao</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Zatvori</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3327,12 +3459,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3390,387 +3562,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Jedinice</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Uroni</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Dubina</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Lozinka</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Pritisak</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Težina</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Postavke</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -3897,72 +4084,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>nepoznato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -3970,103 +4157,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4094,22 +4281,22 @@ p, li { white-space: pre-wrap; } <translation>Zatvori</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Ø</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Min.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Max.</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation type="unfinished"/> </message> @@ -4177,12 +4364,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4196,12 +4383,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Novi početni broj</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4209,12 +4396,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4293,12 +4480,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -4348,6 +4535,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4371,7 +4672,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> <translation type="unfinished"/> </message> </context> @@ -4426,7 +4727,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -4442,11 +4743,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4456,7 +4752,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4506,53 +4802,73 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> <translation type="unfinished"/> </message> </context> @@ -4573,63 +4889,73 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> + <location filename="../qt-ui/usersurvey.ui" line="14"/> + <source>User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="14"/> - <source>User Survey</source> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> <message> @@ -4799,12 +5125,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4812,70 +5145,70 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -4890,13 +5223,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4907,16 +5240,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4942,120 +5275,120 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) ili (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>zrak</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integrirani</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>pojas</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>gležanj</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>backplate olova</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Nije uspjelo čitanje '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -5074,7 +5407,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5088,7 +5421,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>izron</translation> @@ -5135,7 +5468,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5291,42 +5624,42 @@ Maximum</source> <translation>Greška pri parsiranju uzoraka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Događaj: čekanje na korisničku akciju</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Greška pri registraciji event handlera.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Greška pri registraciji cancellation handlera</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Greška pri uvozu podataka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Ne mogu kreirati libdivecomputer kontekst</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Nije uspjelo otvaranje %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5345,432 +5678,474 @@ Maximum</source> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Neuspjeo get_events na bazi. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Neuspjelo spajanje na bazu '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Neuspjeo upit na bazu '%s'. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Neuspjelo spajanje na bazu '%s'. +</translation> + </message> + <message> + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. +</source> + <translation>Neuspjeo upit na bazu '%s'. +</translation> + </message> + <message> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Previše mješavina plinova</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation type="unfinished"/> </message> @@ -5935,97 +6310,97 @@ EADD: %d%s <translation>(nema urona)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Ned</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Pon</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Uto</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Sri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Čet</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Pet</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Sub</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Sij</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Velj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Ožu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Tra</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Svi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Lip</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Srp</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Kol</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Ruj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Lis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Stu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Pro</translation> </message> diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts index c6eb2b260..884106f70 100644 --- a/translations/subsurface_hu.ts +++ b/translations/subsurface_hu.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1068,22 +1068,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Típús</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"/> </message> @@ -1091,18 +1091,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>kezdés</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>befejezés</translation> @@ -1111,97 +1111,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Pal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Hely</translation> </message> @@ -1209,87 +1209,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Mind kinyit</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Összes összecsukása</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Túra létrehozása fentebb</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Túra egyesítése a fentivel</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Túra egyesítése a lentivel</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1297,54 +1297,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation type="unfinished"/> </message> @@ -1359,107 +1354,133 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation type="unfinished"/> </message> @@ -1470,77 +1491,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> + <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> - <source>Send the dive data to divelogs.de website.</source> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> - <source>Send the dive data to dive-share.appspot.com website</source> + <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> - <source>HTML export of the dive locations, visualized on a world map.</source> + <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> - <source>Subsurface native XML format.</source> + <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <source>Subsurface native XML format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> @@ -1579,7 +1606,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Idő</translation> </message> @@ -1605,25 +1632,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation type="unfinished"/> </message> @@ -1638,100 +1665,160 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Hely</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Társ</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation type="unfinished"/> </message> @@ -1843,77 +1930,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Mélység</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Idő</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation type="unfinished"/> </message> @@ -1964,127 +2066,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Mélység</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Pal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Hely</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation type="unfinished"/> </message> @@ -2187,54 +2289,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation type="unfinished"/> </message> @@ -2307,17 +2409,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2356,17 +2483,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2374,7 +2501,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation type="unfinished"/> </message> @@ -2382,7 +2509,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2398,347 +2525,347 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Hely</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Merülés vezető</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Társ</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Felszerelés</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Idő</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Mélység</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Merülések</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Palackok</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2746,92 +2873,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2840,486 +2967,491 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Új</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Ment</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Bezárás</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3327,12 +3459,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3390,387 +3562,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Merülések</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Mélység</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Szűrő</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -3897,72 +4084,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -3970,103 +4157,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4094,22 +4281,22 @@ p, li { white-space: pre-wrap; } <translation>Bezárás</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Átlag</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Maximum</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation type="unfinished"/> </message> @@ -4177,12 +4364,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4196,12 +4383,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Új kezdő szám</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4209,12 +4396,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4293,12 +4480,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -4348,6 +4535,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4371,7 +4672,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> <translation type="unfinished"/> </message> </context> @@ -4426,7 +4727,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -4442,11 +4743,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4456,7 +4752,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4506,53 +4802,73 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> <translation type="unfinished"/> </message> </context> @@ -4573,63 +4889,73 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> + <location filename="../qt-ui/usersurvey.ui" line="14"/> + <source>User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="14"/> - <source>User Survey</source> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> <message> @@ -4799,12 +5125,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4812,70 +5145,70 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -4890,13 +5223,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation type="unfinished"/> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation type="unfinished"/> </message> @@ -4907,16 +5240,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation type="unfinished"/> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation type="unfinished"/> </message> @@ -4942,120 +5275,120 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) vagy (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation type="unfinished"/> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation type="unfinished"/> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation type="unfinished"/> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation type="unfinished"/> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation type="unfinished"/> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation type="unfinished"/> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>'%s' olvasása meghiúsult.</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -5074,7 +5407,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5088,7 +5421,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation type="unfinished"/> @@ -5135,7 +5468,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5291,42 +5624,42 @@ Maximum</source> <translation>Hiba a minták feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Esemény: várakozás a felhasználóra</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Hiba az esemény kezelő regisztrálása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Hiba a visszavonás kezelő regisztrálása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Merülési adat importálási hiba</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5344,429 +5677,472 @@ Maximum</source> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation type="unfinished"/> </message> @@ -5931,97 +6307,97 @@ EADD: %d%s <translation>(nincs merülés)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>H</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>P</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Már</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Ápr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Máj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Jún</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Júl</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index c7ac809bf..7fde26e01 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Tidak dapat menyimpan berkas cadangan %1. Pesan Kegagalan: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Tidak dapat membuka berkas cadangan: %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Penataan berhasil ditulis ke perangkat</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1068,22 +1068,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>ID Perangkat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Nama Panggilan</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"/> </message> @@ -1091,18 +1091,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Bailing out untuk OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>Mulai</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>Akhir</translation> @@ -1111,97 +1111,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Tanggal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Peringkat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kgkg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Pakaian</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/menit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Lokasi</translation> </message> @@ -1209,87 +1209,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1297,54 +1297,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation type="unfinished"/> </message> @@ -1359,107 +1354,133 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Huruf</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Ukuran Huruf</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation type="unfinished"/> </message> @@ -1470,77 +1491,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> + <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> - <source>Send the dive data to divelogs.de website.</source> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> - <source>Send the dive data to dive-share.appspot.com website</source> + <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> - <source>HTML export of the dive locations, visualized on a world map.</source> + <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> - <source>Subsurface native XML format.</source> + <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <source>Subsurface native XML format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> @@ -1579,7 +1606,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation type="unfinished"/> </message> @@ -1605,25 +1632,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Satuan</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metrik</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperial</translation> </message> @@ -1638,100 +1665,160 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Tanggal</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Lokasi</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Rekan</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Catatan</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Berat</translation> </message> @@ -1843,77 +1930,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>edalaman</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Tekanan</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Suhu</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1964,127 +2066,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Tanggal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Peringkat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>edalaman</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Berat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Pakaian</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/menit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Lokasi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2187,54 +2289,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Kesalahan</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation type="unfinished"/> </message> @@ -2307,17 +2409,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2356,17 +2483,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2374,7 +2501,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation type="unfinished"/> </message> @@ -2382,7 +2509,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2398,347 +2525,347 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Lokasi</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Koordinat</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Rekan</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Peringkat</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Jarak Lihat</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Pakaian</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Catatan</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Perlengkapan</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Tanggal</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Rentang Waktu</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Kadar Garam</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Statisktik</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Kedalaman</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Suhu</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Rentang Waktu</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Selam</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Tabung</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Berat</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/menit</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2746,92 +2873,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2840,486 +2967,491 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Baru</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Buka</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Simpan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Simpan sebagai</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Tutup</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Print</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Cltrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Kiri</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Kanan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Batal</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3327,12 +3459,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3390,387 +3562,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Acuan</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Satuan</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Grafik</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Huruf</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Ukuran Huruf</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Selam</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Sistem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metrik</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personalisasi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>edalaman</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kgkg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Saring</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Tekanan</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Suhu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Berat</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Satuan Waktu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Menit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Detik</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Tampilkan</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Lain-lain</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Preferensi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -3897,72 +4084,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Selam #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Kedalaman Maks: 1% 2%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Durasi: %1 menit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -3970,103 +4157,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4094,22 +4281,22 @@ p, li { white-space: pre-wrap; } <translation>Tutup</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Rata-rata</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Minimal</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Maksimal</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation type="unfinished"/> </message> @@ -4177,12 +4364,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4196,12 +4383,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Nomor Awal baru</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4209,12 +4396,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4293,12 +4480,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -4348,6 +4535,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4371,7 +4672,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> <translation type="unfinished"/> </message> </context> @@ -4426,7 +4727,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -4442,11 +4743,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4456,7 +4752,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4506,53 +4802,73 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> <translation type="unfinished"/> </message> </context> @@ -4573,63 +4889,73 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> + <location filename="../qt-ui/usersurvey.ui" line="14"/> + <source>User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="14"/> - <source>User Survey</source> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> <message> @@ -4799,12 +5125,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4812,77 +5145,77 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Total Durasi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Terpendek</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Terjauh</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Dalam (%1) Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Minimal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Maksimal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4898,13 +5231,13 @@ Rata-rata</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4915,16 +5248,16 @@ Rata-rata</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4950,120 +5283,120 @@ Rata-rata</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) or (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>udara</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>terintegrasi</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>sabuk</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>Pergelangan kaki</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>berat plat-punggung</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Gagal baca '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -5082,7 +5415,7 @@ Rata-rata</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5096,7 +5429,7 @@ Rata-rata</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>nai</translation> @@ -5143,7 +5476,7 @@ Rata-rata</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5299,42 +5632,42 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5352,429 +5685,472 @@ Rata-rata</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation type="unfinished"/> </message> @@ -5939,97 +6315,97 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index 07efff1c7..ee74ce3f4 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Persona:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>Ricerca compagni di immersione e Divemaster</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Non è stato possibile salvare il file di backup %1. Messaggio di errore: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Non è possibile aprire il file di backup: %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation>Dettagli del computer letti correttamente</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Impostazioni salvate correttamente sullo strumento </translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Firmware del dispositivo caricato correttamente</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Impostazioni del dispositivo ripristinate correttamente</translation> </message> @@ -847,72 +847,72 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Backup files (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>Si è verificato un errore nel salvataggio del file di backup. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Backup eseguito con successo</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>Le tue impostazioni sono state salvate in: %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation>Backup delle impostazioni del computer</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation>Errore backup XML</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation>Ripristina le impostazioni del computer</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation>Errore ripristino XML</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Si è verificato un errore nel ripristino del file di backup. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>Ripristino avvenuto con successo</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>Le tue impostazioni sono state ripristinate correttamente.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Seleziona il file del firmware</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>Tutti i file (*.*)</translation> </message> @@ -1071,22 +1071,22 @@ il computer selezionato?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Modello</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>ID della periferica</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Nickname</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Cliccando qui si rimuoverà il computer.</translation> </message> @@ -1094,18 +1094,18 @@ il computer selezionato?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Bailing out in circuito aperto</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>inizio</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>fine</translation> @@ -1114,97 +1114,97 @@ il computer selezionato?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>n</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Valutazione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Prof. (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Temp (%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Muta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Bombola</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>CNS massimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Luogo</translation> </message> @@ -1212,87 +1212,87 @@ il computer selezionato?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Espandi tutto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Minimizza tutto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Collassa altri</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Rimuove immersione(i) dal viaggio</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Crea un nuovo viaggio sopra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Aggiungi l'immersione(i) al viaggio subito sopra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Aggiungi l'immersione(i) al viaggio subito sotto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Raggruppa il viaggio con il viaggio sopra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Raggruppa il viaggio con il viaggio sotto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Cancella immersione(i)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Marca l'immersione(i) come non valide</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Fondi le immersioni selezionate</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Rinumera le immersioni</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Cambia gli orari</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Carica immagini</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Apri files di immagine</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Files immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1300,54 +1300,49 @@ il computer selezionato?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Esporta il formato</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Mappa mondiale</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Selezione</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Immersioni selezionate</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Tutte le immersioni</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1362,107 +1357,133 @@ il computer selezionato?</translation> <translation>Esportazione generale</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation>DiveShare</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation>Profondità a cui è stata scattata la foto</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Preferenze generali</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Numerazione di Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation>Esporta le statistiche annuali</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Esporta solo la lista</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Opzioni stile</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Grandezza font</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Luce</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Sabbia</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>File UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV files (*.csv *.CSV)</translation> </message> @@ -1473,77 +1494,83 @@ il computer selezionato?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Valori separati da virgole che includono le informazioni più importanti del profilo di immersione.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Invia i dati di immersione al sito divelogs.de.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation>Invia i dati di immersione al sito dive-share.appspot.com</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Esportazione HTML dei luoghi di immersione, visualizzati su un mappamondo</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Formato XML nativo di Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation>Esporta la profondità a cui sono state scattate le foto.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Esporta file UDDF come</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Esporta file CSV come</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Esporta il mappamondo</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>File HTML (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Esporta Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML files (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation>Salva la profondità a cui sono state scattate le foto</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Esporta file HTML come</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Non posso aprire il file %s</translation> </message> @@ -1582,7 +1609,7 @@ il computer selezionato?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Ora</translation> </message> @@ -1608,25 +1635,25 @@ il computer selezionato?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Separatore di campo</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Unità</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metrico</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperiale</translation> </message> @@ -1641,100 +1668,160 @@ il computer selezionato?</translation> <translation>Immersioni manuali</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation>Scegli l'ordine del giorno, mese e anno per il formato della data. Puoi usare qualsiasi carattere come separatore .-/.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Formato della data</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>dd.mm.yyyy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation>mm/dd/yyyy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation>yyyy-mm-dd</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Immersione nº</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation>Data in formato dd.mm.yyyy, yyyy-mm-dd o mm/dd/yyyy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation>Durata dell'immersione in secondi nel formato min:sec</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Luogo</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Profondità massima</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Configurazione dei campi</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Profondità media</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Compagno</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Note</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Peso</translation> </message> @@ -1846,77 +1933,92 @@ il computer selezionato?</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Profondità</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Ora</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Pressione</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Colore</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Pressione S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation>Pressione ambiente</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Pressione I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Inserito dall'utente</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Indice della bombola</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Ceiling</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>CAS</translation> </message> @@ -1967,127 +2069,127 @@ il computer selezionato?</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Valutazione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Profondità</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Muta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Bombola</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>CNS massimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Luogo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Prof. (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Temp (%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2191,54 +2293,54 @@ il computer selezionato?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Riprova</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Cerca computer Uemis</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Scegli il file per scaricare il log dal computer subacqueo</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Files di Log (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Avviso</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Il salvataggio del dump di libdivecomputer NON inserirà le immersioni nella lista delle immersioni.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Scegli il file di dump per il computer subacqueo</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>File di dump (*.bin)</translation> </message> @@ -2311,17 +2413,42 @@ il computer selezionato?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation>Chiave</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Valore</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2360,17 +2487,17 @@ il computer selezionato?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Questa funzionalità non è ancora disponibile per il computer selezionato.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation>Aggiornamento del firmware fallito!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>Non è stato possibile collegarsi al computer subacqueo.</translation> </message> @@ -2378,7 +2505,7 @@ il computer selezionato?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Modifica i luoghi selezionati</translation> </message> @@ -2386,7 +2513,7 @@ il computer selezionato?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Luogo:</translation> </message> @@ -2402,330 +2529,330 @@ il computer selezionato?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Luogo</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Coordinate</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Compagno</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Valutazione</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Visibilità</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Muta</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Note di immersione</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Temperatura atmosferica</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Temperatura dell'acqua</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Note</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Attrezzatura</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Gas utilizzati</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Gas consumati</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Profondità massima</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Pressione atmosferica</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Tempo di immersione</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Tempo totale</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Consumo gas </translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation>Dati extra</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation>Dati aggiuntivi dal computer subacqueo</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Ora</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Informazioni</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Intervallo</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Profondità media</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Salinità</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Statistiche</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Profondità</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Immersioni</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Foto</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Bombole</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Pesi</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation>Applica le modifiche</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation>Elimina le modifiche</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Aggiungi bombola</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation>Aggiungi la tipologia della pesata</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Temp. aria [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Temp. acqua [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Questo viaggio è stato editato.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Si stanno modificando immersioni multiple.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Si sta modificando questa immersione </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Note di viaggio</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Luogo del viaggio</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Immersione più profonda</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Immersione più superficiale</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation>CAS totale più alto di una immersione</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation>CAS totale più basso di una immersione</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation>CAS totale medio di tutte le immersioni selezionate</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation>Temperatura più alta</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation>Temperatura più bassa</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation>Temperatura media di tutte le immersioni selezionate</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation>Immersione più lunga</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation>Immersione più corta</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation>Durata media di tutte le immersioni selezionate</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2734,17 +2861,17 @@ mixati con aria e usando: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>e</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Elimino le modifiche?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Stai per cancellare le modifiche.</translation> </message> @@ -2752,92 +2879,92 @@ mixati con aria e usando: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&File</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation>Esporta il libretto di immersioni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Visualizza il grafico pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> - <translation>Abilita il calcolo su tutti i tessuti</translation> + <translation>Attiva/disattiva il calcolo su tutti i tessuti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Visualizza il ceiling calcolato dal computer subacqueo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Visualizza il ceiling calcolato</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Visualizza NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> - <translation>Mostra il ceiling calcolato con incrementi di 3m</translation> + <translation>Visualizza il ceiling calcolato con incrementi di 3m</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Configura &Computer subacqueo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Ripianifica &immersione</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Visualizza il battito cardiaco</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>Visualizza la MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Visualizza EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>Visualizza il CAS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> - <translation>Mostra il righello</translation> + <translation>Visualizza il righello</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Dettagli immersione</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Stampa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2850,486 +2977,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Vista</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Aiuto</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Importa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Nuovo logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Nuovo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Apri logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Apri</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl-O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Salva</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Salva</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Sal&va come</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Salva come</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>&Chiudi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Chiudi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>P&referenze</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importa dati &GPS dal web service Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>&Copia dettagli immersione</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>&Incolla dettagli immersione</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>&Profilo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>&Tutti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>&Prossimo computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>Informazioni su &Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>&Globo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Importa da Divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>&Tutto Schermo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Abilita Modalità Tutto Schermo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>&Controlla aggiornamenti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>&Esporta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> - <translation>Mostra/nascondi il grafico della pO₂</translation> + <translation>Visualizza il grafico della pO₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> - <translation>Mostra/nascondi il grafico della pN₂</translation> + <translation>Visualizza il grafico della pN₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Scala grafico</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> - <translation>Scambia immagini</translation> + <translation>Visualizza immagini</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> - <translation>Scambia bombole</translation> + <translation>Visualizza barra delle bombole</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>&Filtra la lista delle immersioni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> - <translation>Attiva/disattiva il grafico dei tessuti</translation> + <translation>Visualizza il grafico dei tessuti</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Stampa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&Esci</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Importa &dal computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Rinumera</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>&Modifica il nome della periferica</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>&Aggiungi immersione</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Raggruppamento Automatico</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>&Statistiche Annuali</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>Lista immersioni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Computer precedente</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Sinistra</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Destra</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>&Manuale utente</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>Pianifica immersione</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>&Importa logbook da file</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Importa log delle immersioni da altra applicazioni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Apri file</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Annulla</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Stampa la tabella con il runtime</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Salvo le modifiche?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Apri file come</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Apri file di log immersioni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Avviso</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Statistiche Annuali</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3337,12 +3469,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>I Filtri mostrano %1 (di %2) immersioni</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3400,387 +3572,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Default</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Unità</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Grafico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Lingua</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Rete</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Grandezza font</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Immersioni</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Usa il default</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animazioni</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Velocità</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Cancella tutte le impostazioni</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Riporta tutte le impostazioni ai valori iniziali</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metrico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperiale</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personalizza</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Profondità</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>metri</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>piedi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>litro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>piedi cubici</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Impostazione di sistema predefinita</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Tipo di proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Porta</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Richiede autenticazione</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Nome utente</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Password</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filtro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Pressione</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Liste e tabelle</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>File del log delle immersioni di default</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Visualizza le immersioni non valide</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Bombola di default</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Usa la bombola di default</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface web service</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>ID utente di default</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Salvare ID utente localmente?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Unità di Tempo</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minuti</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Secondi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Mostra</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow alla massima profondità</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Varie</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Preferenze</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Denominatore della risalita/discesa </translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Soglia quando è visibile la pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Soglia quando è visibile la pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Soglia quando è visibile la pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Massima pO₂ a cui mostrare la MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Colora di rosso il ceiling riportato dal computer</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Mostra bombole non utilizzate nel pannello dell'attrezzatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Mostra profondità media</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Nessun proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Proxy di sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>Proxy HTTP</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Richiesto riavvio</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Per caricare correttamente la nuova lingua è richiesto il riavvio di Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Se clicchi OK, tutte le impostazionei di Subsurface verranno riportate ai loro valori di default. La modifica sarà immediata.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Apri il log delle immersioni di default</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Avviso</translation> </message> @@ -3907,72 +4094,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Immersione nº%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Massima profondità: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Durata: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Gas usato:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Tags:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>CAS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Pesi:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Note:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Compagno:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Muta:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Visibilità</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Valutazione:</translation> </message> @@ -3980,103 +4167,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation>(nº%1 of %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>La visualizzazione NDL / TTS è stata disabilitata perchè i calcoli richiedono troppo tempo</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Rendilo computer principale</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Cancella questo computer subacqueo</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Aggiungi un cambio gas</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation>(Bombola %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation>Aggiungi un cambio di set-point</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Aggiungi un segnalibro</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Rimuovi evento</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Nascondi eventi simili</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Modifica il nome</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <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="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Mostra tutti gli eventi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Nascondi gli eventi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Nascondi tutti gli eventi %1?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Rimuovere l'evento selezionato?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Modifica il nome del bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Nome personalizzato:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Il nome è troppo lungo</translation> </message> @@ -4104,22 +4291,22 @@ p, li { white-space: pre-wrap; } <translation>Chiudi</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Media</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Minimo</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Massimo</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Spostare la mappa e fare doppio-click per definire la posizione dell'immersione</translation> </message> @@ -4187,12 +4374,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Questa funzionalità non è ancora disponibile per questo computer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>Non è stato possibile connettersi al computer subacqueo.</translation> </message> @@ -4206,12 +4393,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Nuovo numero di inizio</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Nuovo numero</translation> </message> @@ -4219,12 +4406,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Questa funzionalità non è ancora disponibile per il computer selezionato.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>Non è stato possibile connettersi al computer subacqueo.</translation> </message> @@ -4303,12 +4490,12 @@ p, li { white-space: pre-wrap; } <translation>Quale data ed orario sono mostrati nell'immagine?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Apri il file dell'immagine</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Files immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4358,6 +4545,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4381,8 +4682,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Libretto delle immersioni multipiattaforma<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4436,7 +4737,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Mute:</translation> </message> @@ -4452,11 +4753,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Aggiungi bombola</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4466,7 +4762,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Tag:</translation> </message> @@ -4516,54 +4812,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Controlla gli aggiornamenti.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface non è riuscito a controllare gli aggiornamenti.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Si è verificato il seguente errore:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Per favore controlla la tua connessione Internet</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation>Stai usando la versione più recente di Subsurface</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>E' disponibile una nuova versione di Subsurface.<br/>Clicca su:<br/><a href="%1">%1</a><br/> per scaricarla.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation>E' disponibile una nuova versione di Subsurface</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation>La versione più recente è %1, controlla gli aggiornamenti del tuo sistema operativo.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation>La versione più recente è</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>S'è verificato un errore nella ricerca degli aggiornamenti.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4583,64 +4899,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Ci piacerebbe saperne di più dei nostri utenti, le loro preferenze e le loro abitudini d'uso del programma. Per favore dedicaci un minuto per compilare il questionario e inviarlo al team di Subsurface. Seleziona tutte le opzioni che ti riguardano.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Sondaggio</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Sondaggio degli utenti di Subsurface</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Subacqueo ricreativo</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Subacqueo tecnico</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Interessato alla pianificazione di immersioni</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Scarico immersioni da un computer supportato</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Importo immersioni da altri programmi / fonti</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Inserisco le immersioni manualmente</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Uso la companion app su Android per tracciare i siti di immersione</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Per favore scrivi dei suggerimenti (in Inglese) nella casella di testo che segue</translation> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Oltre al sondaggio, verranno inviate anche le seguenti informazioni sul tuo computer</translation> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4813,12 +5139,19 @@ OS Architettura CPU: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Questa funzionalità non è ancora disponibile per il computer selezionato.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>Non è stato possibile connettersi al computer subacqueo.</translation> </message> @@ -4826,79 +5159,79 @@ OS Architettura CPU: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Anno > Mese / Viaggio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>n</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Durata Totale</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Più corta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Più lunga</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Profondità (%1) Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Minimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Massimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>CAS(%1) Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4914,13 +5247,13 @@ Media</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4931,16 +5264,16 @@ Media</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4966,120 +5299,120 @@ Media</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>aria</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integrato</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>cintura</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>caviglia</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>peso della piastra</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Impossibile leggere '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>Non posso aprire il file CSV %s; per favore usa la finestra Importa logbook da file</translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Importazione dal Poseidon fallita: impossibile leggere '%s'</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation>Boccaglio in posizione OC</translation> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation>Boccaglio in posizione CC</translation> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation>Posizione del boccaglio sconosciuta</translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation>Posizione del boccaglio non connesso</translation> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation>Spento</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation>Calibrazione O₂ fallita</translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation>Calibrazione O₂</translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation>Nessun computer corrispondente per il file '%s'</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Il numero massimo di colonne supportate nel file CSV è di %d</translation> </message> @@ -5098,7 +5431,7 @@ Media</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation>batteria</translation> </message> @@ -5112,7 +5445,7 @@ Media</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>risalita</translation> @@ -5159,7 +5492,7 @@ Media</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5315,42 +5648,42 @@ Media</translation> <translation>Errore analizzando i campioni</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Evento: in attesa dell' azione dell'utente.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modello=%u (0x%08x), firmware=%u (0x%08x), numero di serie=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Errore registrando il gestore degli eventi.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Errore registrando il gestore della cancellazione.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Errore importazione dati immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Impossibile creare un contesto libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Impossibile aprire %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Privilegi insufficienti per aprire il dispositivo %s %s (%s)</translation> </message> @@ -5370,223 +5703,254 @@ Media</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Interrogazione get_events fallita. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>La query get_tags sul database non è riuscita. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Connessione al database fallita '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Interrogazione al database fallita '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>La query get_cylinders sul database non è riuscita. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. </source> - <translation>La query get_changes sul database non è riuscita. + <translation>Connessione al database fallita '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>La query get_profile_sample sul database non è riuscita. - + <translation>Interrogazione al database fallita '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Non é possibile aprire il foglio di stile %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Non trovo il gas %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Troppe miscele gas</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Calcolo della decompressione annullato per tempo eccessivo</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>basato su GFlow = %d e GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Piano di immersione di Subsurface </translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>profondità</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>durata</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <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="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <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="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Cambio gas a %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Passa al gas %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consumo del gas (CCR legs escluse):</translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Consumo gas:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Avviso</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>DISCLAIMER / AVVISO: QUESTA È UNA NUOVA IMPLEMENTAZIONE DELL'ALGORITMO DI BUHLMANN E DELL'IMPLEMENTAZIONE DEL PIANO DI IMMERSIONE BASATO SU CIÒ CHE HA RICEVUTO SOLO UNA LIMITATA QUANTITA' DI TEST. E' ALTAMENTE RACCOMANDATO DI NON PIANIFICARE IMMERSIONI BASATE SEMPLICEMENTE SUI RISULTATI DATI QUI.</translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <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="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <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="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s nella risalita pianificata)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante la risalita pianificata) di %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5595,28 +5959,28 @@ D:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P:%d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>CAS: %.*f%s/min @@ -5624,42 +5988,42 @@ D:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO₂%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN₂ %s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5668,7 +6032,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5677,161 +6041,167 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sosta di sicurezza: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sosta di sicurezza: </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: temo di sosta sconosciuto @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>In deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL:%umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Ceiling calcolato %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tessuto %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>Battito cardiaco: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>Direzione: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 immersioni)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 immersione)</translation> </message> @@ -5996,97 +6366,97 @@ EADD: %d%s <translation>(nessuna immersione)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Dom</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Lun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Mer</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Gio</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Ven</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Sab</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Gen</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Mag</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Giu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Lug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Ott</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Dic</translation> </message> diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts index 77700ee59..2cca73e3e 100644 --- a/translations/subsurface_lv_LV.ts +++ b/translations/subsurface_lv_LV.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1069,22 +1069,22 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Modelis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Ierīces ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Lietotājvārds</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Noklikšķot šeit Jūs noņemsiet niršanas datoru.</translation> </message> @@ -1092,18 +1092,18 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Pāreja uz OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>Kļūda: %1</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>beigas</translation> @@ -1112,97 +1112,97 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Datums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Novērtējums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>mārciņa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Kostīms</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Balons</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Maks. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Vieta</translation> </message> @@ -1210,87 +1210,87 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Izvērst visu</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Savērst visu</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Savērst pārējus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Noņemt niršanas reizi(-es) no ceļojuma</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Izveidot jaunu ceļojumu augšup</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Nekavējoties pievienot niršanu(-as) ceļojumam augšup</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Tūlītēji pievienot niršanu(-as) pie apakšēja ceļojuma</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Saplūdināt ceļojumu ar augšējo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Saplūdināt ceļojumu ar apakšējo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Izdzēst niršanu(-as)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Atzīmēt niršanu(-as) kā nepareizus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Saplūdināt izvēlētas niršanas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Pārnumurēt niršanu(-as)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Nobīdīt laikus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Ielādēt attēlus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Atvērt attēla failu</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1298,54 +1298,49 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Eksportēšanas formāts</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Pasaules karte</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Izvēle</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Izvēlētas niršanas</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Visas niršanas</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1360,107 +1355,133 @@ likvidēt izvēlētus datorus?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Numuri Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Eksportēt tikai sarakstu</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Stila opcijas</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Fonts</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Fonta izmērs</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Tēma</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Gaišs</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Smilts</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF faili (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV faili (*.csv *.CSV)</translation> </message> @@ -1471,77 +1492,83 @@ likvidēt izvēlētus datorus?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> + <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> - <source>Send the dive data to divelogs.de website.</source> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> - <source>Send the dive data to dive-share.appspot.com website</source> + <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> - <source>HTML export of the dive locations, visualized on a world map.</source> + <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> - <source>Subsurface native XML format.</source> + <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <source>Subsurface native XML format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Eksportēt UDDF failu kā</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Eksportēt CSV failu kā</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Eksportēt pasaules karti</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML faili (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Eksportēt Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML faili (*.xml, *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Eksportēt HTML failus, kā</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Nevar atvērt failu %s</translation> </message> @@ -1580,7 +1607,7 @@ likvidēt izvēlētus datorus?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Laiks</translation> </message> @@ -1606,25 +1633,25 @@ likvidēt izvēlētus datorus?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Lauka atdalītājs</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Vienības</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metrisks</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperiāls</translation> </message> @@ -1639,100 +1666,160 @@ likvidēt izvēlētus datorus?</translation> <translation>Roku niršanas</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Niršana #</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Datums</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Tagi</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Vieta</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Maks. dziļums</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Lauka konfigurēšana</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Vid. dziļums</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Draugs</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Piezīmes</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Svars</translation> </message> @@ -1844,77 +1931,92 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Dziļums</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Laiks</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Spiediens</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatūra</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Krāsa</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Spiedums S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Spiediens I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Ievādīts lietotājs</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Balona indekss</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Maksimāla dekompr. pietura</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1965,127 +2067,127 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Datums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Novērtējums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Dziļums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Svars</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Kostīms</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Balons</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Maks. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Vieta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>mārciņa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2189,54 +2291,54 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Kļūda</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Atkārtot</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Atrast Uemis niršanas datoru</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Izvēliet failu priekš žurnāla lejupielādēšanas no niršanas datora</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Žurnalēšanas faili (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Brīdinājums</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Saglabājot izraksti, niršanas NEsaglabājas niršanas sarakstā.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Izvēliet failu priekš niršanas datora bināra izraksta</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Izraksta faili (*.bin)</translation> </message> @@ -2309,17 +2411,42 @@ likvidēt izvēlētus datorus?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2358,17 +2485,17 @@ likvidēt izvēlētus datorus?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2376,7 +2503,7 @@ likvidēt izvēlētus datorus?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Rediģēt izvēlētas niršanas vietas</translation> </message> @@ -2384,7 +2511,7 @@ likvidēt izvēlētus datorus?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2400,347 +2527,347 @@ likvidēt izvēlētus datorus?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Vieta</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Koordinātas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Niršanas speciālists</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Draugs</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Tagi</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Novērtējums</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Redzamība</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Kostīms</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Niršanas piezīmes</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Gaisa temp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Ūdens temp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Piezīmes</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Aprīkojums</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Izmant. gāzes</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Patērēta gāze</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Maks. dziļums</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Gaisa spiediens</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Niršanas laiks</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Kopējais laiks</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Gāzes patērēšana</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Datums</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Laiks</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Niršanas informācija</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Intervāls</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Vid. dziļums</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Sāļums</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Statistika</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Dziļums</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatūra</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Niršanas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Fotogrāfijas</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Cilindri</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Sver</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Pievienot cilindri</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Gaisa temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Ūdens temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Ceļojuma rediģēšana.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Daudzkārtīga ceļojumu rediģēšana.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Niršanas rediģēšana.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Ceļojuma piezīmes</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Ceļojuma vieta</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Visdziļākā niršana</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>un</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Atcelt izmaiņas?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Jūs taisāties atcelt izmaiņas.</translation> </message> @@ -2748,92 +2875,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&Fails</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Pārslēgt pHe grafiku</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Pārslēgt NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Pārslēgt pulsu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>Pārslēgt MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Pārslēgt EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Niršanas plāna detaļas</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Drukāt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2846,486 +2973,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Žurnāls</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Skats</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Palīdzība</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Imports</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Jauns žunāls</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Jauns</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Atvērt žurnālu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Atvērt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Saglabāt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Saglabāt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Saglabāt kā</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Saglabāt kā</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>Aizvērt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Aizvērt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+w</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>Preferences</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importēt &GPS datus no Subsurface servissa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>Profils</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>Visi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>Nākamais DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>Par Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>Karte</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+l</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Importēt &no divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>Pilnekrāns</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Pārslēgt pilnekrāna režīmu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation> &Pārbaudīt atjaunāšanas</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>Eksports</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Drukāt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&Pabeigt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Importēt no &niršanas datora</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Pārnumurēt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>&Rediģēt ierīces vārdu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>&Pievienot niršanu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>&Auto-grupēšana</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>&Gada statistika</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>&Niršanas saraksts</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Pa kreisi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Pa labi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>Plānotājs</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>&Importēt žurnalēšanas failu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Importēt žurnālus no citām programmām</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Atvērt failu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Atcelt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms fails aizvēršanas.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms niršanas pievienošanas.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Izdrukāt niršanas tabulu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vai velāties saglabāt izmaiņas datnē %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vai velāties saglabāt izmaiņas datnes datu datnē?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Saglabāt izmaiņas?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Saglabāt kā</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Atvērt niršanas žurnālu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <source>Changes will be lost if you don't save them.</source> <translation>Izmaiņas pazūs, ja tos nesaglabāt.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Brīdinājums</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms jauna faila atveršanas.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Gada statistika</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Lūdzu, pabeidziet tekošo rediģēšanu pirms mēģinot citu.</translation> </message> @@ -3333,12 +3465,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3396,387 +3568,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Noklusējumi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Mērvienības</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Grafiks</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Valoda</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Tīkls</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Fonts</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Fonta izmērs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Niršanas</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animācija</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Ātrums</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Dzēst visus iestatījumus</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Sistēma</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metrisks</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperiāls</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personalizēt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Dziļums</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>metrs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>pēda</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>litrs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>ft³</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsija</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fārenheita</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Sistēmas noklusējama iestādīšana</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Proxy veids</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Ports</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Vajadzīga autorizācija</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Lietotājvārds</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Parole</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filtrs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Spiediens</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Saraksti un tabulas</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Noklusējama niršanas datne</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Izrādīt nederīgu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Noklusējamais balons</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Izmantot noklusējamo balonu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface tīmekļa serviss</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Lietotāja ID pēc noklusējama</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Saglabāt lietotāja ID lokāli?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Tilpums</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatūra</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Svars</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Laika mērvienības</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minūtes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Sekundes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Parādīt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow maks. dziļumā</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Dažāds</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Priekšrocības</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Pacelšanas/nolaišanas ātruma saucējs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Sliekšņu vērtība pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>sliekšņu vērtība pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>sliekšņu vērtība pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>maks ppO₂ parādot MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Parādīt vidējo dziļumu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Ir nepieciešams restarts</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Lai pareizi atspoguļotu jaunu valodu Jums jārestartē Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Atvērt noklusējamo žurnalēšanas datni</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Brīdinājums</translation> </message> @@ -3903,72 +4090,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>nezināms</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Niršana #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Maks. dziļums: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Ilgums: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Izm. gāze:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Tagi:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Krava:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Piezīmes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Niršanas speciālists:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Draugs:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Kostīms:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Redz.:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Novērtējums:</translation> </message> @@ -3976,103 +4163,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation>(#%1 no %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Padarīt niršanas datoru par pirmo</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Nodzēst šo niršanas datoru</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Pievienot gāzes maiņu</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Pievienot grāmatzīmi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Noņemt notikumu</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Paslēpt līdzīgus notikumus</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Rediģēt vārdu</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Parādīt visus notikumus</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Paslēpt notikumus</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Paslēpt visus %1 notikumus?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Nodzēst izvēlēto notikumu?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Rediģēt grāmatzīmes vārdu</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Vārds:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4100,22 +4287,22 @@ p, li { white-space: pre-wrap; } <translation>Aizvērt</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Vidējais</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Minimums</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Maksimums</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Pārvietojiet karti un klikšķiet divreiz, lai atzīmētu niršanas vietu</translation> </message> @@ -4183,12 +4370,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4202,12 +4389,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Jauns sākuma skaitlis</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Jauns numurs</translation> </message> @@ -4215,12 +4402,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4299,12 +4486,12 @@ p, li { white-space: pre-wrap; } <translation>Kurš datums un laiks ir attēlots?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Atvērt attēla failu</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4354,6 +4541,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4377,8 +4678,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multiplatformu niršanas žurnāla programmatūra<br><span style='font-size: 8pt'>Linuss Torvaldss, Dirks Hondels, Tomazs Kanabravas, un citi, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4432,7 +4733,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -4448,11 +4749,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Pievienot cilindri</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4462,7 +4758,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4512,54 +4808,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Pārbaudīt atjaunāšanas.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface'am neizdevas pārbaudīt atjaunāšanas</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Sekojoša kļūda gadījas:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Lūdzu, pārbaudiet interneta pieslēgšanu.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Gadījas kļūda pārbaudot atjaunāšanas.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4579,63 +4895,73 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Mēs vēlētos vairāk uzzināt par mūsu lietotājiem un viņu vēlmēm. Lūdzu, veltiet vienu minūti jūsu laika, aizpildot anketu un nosūtot to Subsurface komandai. Norādiet variantus, kuri jums der.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Lietotāja pārskats</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Subsurface lietotāja aptauja</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Interesē niršanas plānošana</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Es lejuplādēju iegremdēšanu no niršanas datora</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Es lejuplādēju iegremdēšanu no citiem programmām / avotiem</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Es ievadu iegremdēšanu manuāli</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> <message> @@ -4809,12 +5135,19 @@ OS CPU Arhitektūra: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4822,79 +5155,79 @@ OS CPU Arhitektūra: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Gads > Mēnesis / Ceļojums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Ilgums Kopā</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Vidējais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Īsakais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Garākais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Dziļums (%1) Vidējais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Minimums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Maksimums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Vidējais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4910,13 +5243,13 @@ Vidējais</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4927,16 +5260,16 @@ Vidējais</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4962,120 +5295,120 @@ Vidējais</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) vai (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>gaiss</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integrēts</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>josta</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>svars uz kājām</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>svars uz plātni</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Neizdevas nolasīt '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksimālais atbalstītais stabu skaits CSV importēšanai ir %d</translation> </message> @@ -5094,7 +5427,7 @@ Vidējais</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5108,7 +5441,7 @@ Vidējais</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>stāvums</translation> @@ -5155,7 +5488,7 @@ Vidējais</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5311,42 +5644,42 @@ Vidējais</translation> <translation>Kļūda parsējot paraugus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Notikums: gaida lietotāja darbību</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modelis=%u (0x%08x), aparātprogrammatūra=%u (0x%08x), serial numurs=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Kļūda reģistrējot notikumu apstrādātāju.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Kļūda importējot niršanas datus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Nav iespējams izveidot libdivecomputer kontekstu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Nevar atvērt %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5365,222 +5698,254 @@ Vidējais</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Kļūme datubāzes vaicājumā get_events. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Neizdevas datubāzes pieprasījums get_tags. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Kļūme savienojoties ar datubāzi '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Kļūme vaicājot datubāzi '@s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Neizdevas datubāzes pieprasījums get_cylinders. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. </source> - <translation>Neizdevas datubāzes pieprasījums get_changes. + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Kļūme savienojoties ar datubāzi '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Neizdevas datubāzes pieprasījums get_profile_sample. + <translation>Kļūme vaicājot datubāzi '@s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Nevar atvērts stila lapu %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Nevar atrast gāzi %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Parāk daudz gāzes maisījumu</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>Pamatots uz GFlow = %d un GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurface niršanas plāns</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>dziļums</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>izpildlaiks</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>ilgums</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>gāze</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Pāreja uz %.*f %s pēc %d:%02d min - izpildlaiks %d:%02u ar maisījumu %s</translation> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Apturēties uz %.*f %s uz %d:%02d min - izpildlaiks %d:%02u uz maisījuma %s</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Pārslēgt gāzi uz %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Gāzes patēriņš:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Brīdinājums:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5589,70 +5954,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>S: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>L: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>Ā: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5661,7 +6026,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5670,49 +6035,49 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Drošības apstāšana: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Drošības apstāšana: nez. laiks @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Dekompr.: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Dekompr.: nez. laiks @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>Dekompresijā </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin @@ -5721,113 +6086,119 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Dekompr.: %umin @ %.0f%s (izrēķ.) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>Dekompresijā (izrēķ.) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (izrēķ.) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (izrēķ.) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Aprēķināta maks. dekompr. pietura %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Audu līmenis %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>sirdspuksti: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>azimuts: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 niršanas)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 niršana)</translation> </message> @@ -5992,97 +6363,97 @@ EADD: %d%s <translation>(nav niršanas)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Svēt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Pirm</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Otr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Treš</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Cet</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Piekt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Sest</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Maijs</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Jūn</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Jūl</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 2e22a91f3..bfe9b9c53 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Person: </translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>Søk etter buddyer og dykkeledere</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Kunne ikke lagre backupfila %1. Feilmelding: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Kunne ikke åpne backupfila: %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Lagret til computer</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Firmware på computer er oppdatert</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Innstillinger på computer er resatt</translation> </message> @@ -847,70 +847,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1068,22 +1068,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Enhets-ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Navn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Klikk her for å fjerne denne dykkecomputeren.</translation> </message> @@ -1091,18 +1091,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Bytter til OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation> start</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation> slutt</translation> @@ -1111,97 +1111,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Sted</translation> </message> @@ -1209,87 +1209,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Fold ut turer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Fold sammen turer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Slå sammen andre</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Fjern dykk fra tur</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Lag ny tur</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Legg til dykk til turen over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Legg til dykk til turen under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Slå samme tur med turen over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Slå sammen tur med turen under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Marker dykk som ugyldige</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Slå sammen valgte dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Renummerer dykk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Flytt tidspunkter</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Last inn bilder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Åpne bilder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1297,54 +1297,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Eksportformat</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Verdenskart</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Valg</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Valgte dykk</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Alle dyk</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1359,107 +1354,133 @@ <translation>Generell eksport</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Generelle innstillinger</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Subsurface-tall</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Bare eksporter liste</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Stilvalg</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Skrifttype</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Skriftstørrelse</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Lys</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Sand</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF-filer (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV-filer (*.csv *.CSV)</translation> </message> @@ -1470,77 +1491,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Kommaseparerte verdier som inkluderer mesteparten av informasjonen fra dykkeprofilen.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Send dataene til divelogs.de.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML-eksport av dykkestedene, visualisert på et verdenskart.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Subsurface sitt eget XML-format.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Eksporter UDDF-filer som</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Eksporter CSV-file som</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Eksporter verdenskart</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML-filer (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Eksporter Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML-filer (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Eksporter HTML-filer som</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Klarer ikke åpne fila %s</translation> </message> @@ -1579,7 +1606,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Tid</translation> </message> @@ -1605,25 +1632,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Feltseparator</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Enheter</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metrisk</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Britiske mål</translation> </message> @@ -1638,100 +1665,160 @@ <translation>Manuelle dykk</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Datoformat</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Dykk #</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Emner</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Maksdybde</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Feltvalg</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Snittdybde</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Notater</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Vekt</translation> </message> @@ -1843,77 +1930,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Trykk</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Farge</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Trykk S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Trykk I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Brukeren la inn</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Flaskeindeks</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Tak</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1964,127 +2066,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2188,54 +2290,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Feil</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Prøv igjen</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Finn Uemis dykkecomputer</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Velg fil som loggfil for dykkecomputer</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Loggfiler (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Lagring av dump fra libdivecomputer vil IKKE laste ned dykk til dykkeloggen.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Velg fil som binærdump fra dykkecomputer</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Dumpfiler (*.bin)</translation> </message> @@ -2308,17 +2410,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2357,17 +2484,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2375,7 +2502,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Rediger valgte steder</translation> </message> @@ -2383,7 +2510,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2399,330 +2526,330 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Koordinater</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Emner</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Sikt</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Notater</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Notater</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Utstyr</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Brukte gasser</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Maksdybde</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Lufttrykk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Totaltid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Detaljer</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Overflateintervall</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Snittdybde</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Saltholdighet</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Statistikk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Dykk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Flasker</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Vekter</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Legg til flaske</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Vanntemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Denne turen redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Flere dykk redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Dette dykket redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Turnotater</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Tursted</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Dypeste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Grunneste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2731,17 +2858,17 @@ fra luft og bruker: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>og</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Slette endringer?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Du er i ferd med å droppe endringene dine.</translation> </message> @@ -2749,92 +2876,92 @@ fra luft og bruker: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&Fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Skru pHe-graf av/på</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Skru av/på utregning av vev</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Skru av/på dekograf fra computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Skru av/på dekograf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Skru av/på NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Skru av/på 3m-inkrementer for dekotak</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Skru av/på hjertefrekvens</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>Skru av/på MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Skru av/på EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>Skru av/på SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Skru av/på linjal</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Detaljer for dykkeplan</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Skriv ut</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2847,486 +2974,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Logg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Vis</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Hjelp</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Importer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Ny loggbok</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Ny</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>Åpne l&oggbok</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Åpne</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>Lagre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Lagre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Lagre som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Lagre som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>Lukk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Lukk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>Valg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importer &GPS-data fra Subsurface webtjeneste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>&Alle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>&Neste computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>Om Subsurf&ace</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>&Globus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Importer &fra divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>&Fullskjerm</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Fullskjerm av/på</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>Se etter oppdateringer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>&Eksport</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>Skriv ut</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Importer fra &dykkecomputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>Nummere&r på nytt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>Rediger &enhetsnavn</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>Legg til dykk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Auto&grupper</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>&Dykkeliste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Fo&rrige computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Venstre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Høyre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>Bruker&manual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>P&lanlegg dykk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>&Importer loggfiler</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Importer dykkelogg fra andre programmer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3334,12 +3466,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3397,387 +3569,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Standardvalg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Enheter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Graf</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Språk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Nettverk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Skrifttype</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Skriftstørrelse</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Dykk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Bruk standard</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animasjoner</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Hastighet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Slett alle valg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Tilbakestill valg til standardverdier</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metrisk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Britiske mål</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personaliser</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>fot</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>ft³</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Systemstandard</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Proxytype</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Tjener</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Krever autentisering</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Brukernavn</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Passord</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Trykk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Lister og tabeller</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Standard loggfil</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Vis ugyldige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Standardflaske</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Bruk standardflaske</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface webtjeneste</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Standard bruker-ID</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Lagre bruker-ID lokalt?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volum</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Tidsenheter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minutter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Sekunder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Vis</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GF lav ved maksdybde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Ymse</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Valg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Tidsenhet for opp- og nedstigning</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Grense når pO₂ vises</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Grense når pN₂ vises</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Grense når pHe vises</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Maks pO₂ når MOD vises</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Farg dekograf fra dykkecomputer i rødt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Vis ubrukte flasker i utstyrsfanen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Vis snittdybde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GF lav</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GF høy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Ingen proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>System-proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP-proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS-proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Programmet må startes på nytt</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>For å bytte språk må du starte Subsurface på nytt.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Hvis du velger OK vil alle innstillinger bli satt til standardverdier. Dette skjer umiddelbart.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Åpne standardloggfil</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -3904,72 +4091,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Dykk nr. %1- %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Max dybde: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Varighet: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Gassforbruk:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Emneord:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Vekter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Notater:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> @@ -3977,103 +4164,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Gjør til første dykkecomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Slett denne dykkecomputeren</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Legg til gassbytte</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Legg til bokmerke</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Fjern hendelse</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Skjul lignende hendelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Vis alle hendelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Skjul hendelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hendelser?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Fjern den valgte hendelsen?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Rediger navn på bokmerke</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Tilpasset navn:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Navnet er for langt</translation> </message> @@ -4101,22 +4288,22 @@ p, li { white-space: pre-wrap; } <translation>Lukk</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Gjennomsnitt</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Maksimum</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Finn sted i kartet og dobbeltklikk for å sette posisjon</translation> </message> @@ -4184,12 +4371,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4203,12 +4390,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Nytt startnummer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Nytt tall</translation> </message> @@ -4216,12 +4403,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4300,12 +4487,12 @@ p, li { white-space: pre-wrap; } <translation>Hvilket dato og tid vises på bildet?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Åpne bilder</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4355,6 +4542,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4378,8 +4679,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-plattform dykkeloggprogramvare<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava med flere, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4433,7 +4734,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -4449,11 +4750,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Legg til flaske</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4463,7 +4759,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4513,54 +4809,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Se etter oppdateringer.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface klarte ikke å se etter oppdateringer.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Den følgende feilen inntraff:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Sjekk internettforbindelsen din.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Det oppstod en feil under leting etter oppdatering.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4580,64 +4896,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Vi ønsker å lære mer om brukerne våre, deres valg og bruksmønster. Fyll gjerne ut dette skjemaet og send til Subsurface-teamet. Kryss av alle valg som gjelder deg.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Brukerundersøkelse</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Brukerundersøkelse for Subsurface</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Sportsdykker</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Teknisk dykker</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Interessert i dykkeplanlegging</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Jeg laster ned dykk fra en støtta dykkecomputer</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Jeg importerer dykk fra annen programvare / andre kilder</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Jeg legger inn dykk manuelt</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Jeg bruker tilleggsappen for Android for å legge inn dykkelokasjoner</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Skriv forslag (på engelsk) i den følgende boksen</translation> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Den følgende informasjonen om systemet ditt blir også lagt ved</translation> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4807,12 +5133,19 @@ OS CPU-arkitektur: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4820,79 +5153,79 @@ OS CPU-arkitektur: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>År > Måned / Tur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Varighet Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Kortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Lengst</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Dybde (%1) Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Maksimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4908,13 +5241,13 @@ Snitt</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4925,16 +5258,16 @@ Snitt</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4960,120 +5293,120 @@ Snitt</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>pund</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>luft</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integrert bly</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>vektbelte</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>ankelvekt</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>p-vekt</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Kunne ikke åpne '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maks antall kolonner i CSV-importen er %d</translation> </message> @@ -5092,7 +5425,7 @@ Snitt</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5106,7 +5439,7 @@ Snitt</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>oppstigning</translation> @@ -5153,7 +5486,7 @@ Snitt</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5309,42 +5642,42 @@ Snitt</translation> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5363,222 +5696,254 @@ Snitt</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Databasespørring get_events feilet. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Databasespørring get_tags feilet. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Databaseforbindelse feilet '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Databasespørring feilet '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Databasespørring get_cylinders feilet. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. </source> - <translation>Databasespørring get_changes feilet. + <translation>Databaseforbindelse feilet '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Databasespørring get_profile_sample feilet. + <translation>Databasespørring feilet '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åpne stilark %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Finner ikke gassen %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>For mange gassmikser</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Kalkulering av dekompresjon tok for lang tid, og er avbrutt</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>basert på GFlow = %d og GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurface dykkeplan</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>dybde</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>løpetid</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>lengde</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>gass</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Bytt til gass %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Gassforbruk:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <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="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <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="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s i planlagt oppstigning)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planlagt oppstigning) av %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5587,70 +5952,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5659,7 +6024,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5668,162 +6033,168 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sikkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>I deko (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Kalkulert tak %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Vev %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>puls: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>retning: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dykk)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 dykk)</translation> </message> @@ -5988,97 +6359,97 @@ EADD: %d%s <translation>(ingen dykk)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>søn</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>man</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>tir</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>ons</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>tor</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>fre</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>lør</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>des</translation> </message> diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index b4d553021..693a1163b 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Persoon:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>zoekt naar buddies en divemasters</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Kan het backup bestand %1 niet bewaren. Foutmelding: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Kan het backup bestand niet openen: %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation>Details duikcomputer opgehaald.</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Instelling bewaard op het toestel</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Firmware bijgewerkt</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Instellingen van het toestel teruggesteld</translation> </message> @@ -847,72 +847,72 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Backup bestanden (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>Fout tijdens het opslaan van het backup bestand %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Backup geslaagd</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>Uw instellingen zijn bewaard in: %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation>Backup duikcomputer instellingen</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation>Fout in XML backup</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation>Instellingen duikcomputer herstellen</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation>Fout bij het herstellen van XML</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Fout tijdens het herstellen van het backup bestand. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>Herstelling geslaagd</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>Uw instellingen zijn hersteld.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Firmware bestand selecteren</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>Alle bestanden (*.*)</translation> </message> @@ -1071,22 +1071,22 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Toestel ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Apparaatnaam</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Klik hier om deze duikcomputer te verwijderen.</translation> </message> @@ -1094,18 +1094,18 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Schakel om naar OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation> begin</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation> eind</translation> @@ -1114,97 +1114,97 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Waardering</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Diepte (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Temp (%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Gewicht (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Pak</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Fles</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>Gasverbruik (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Locatie</translation> </message> @@ -1212,87 +1212,87 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Alles uitklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Alles inklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>andere samenklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>duik(en) uit trip verwijderen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Nieuwe trip hierboven invoegen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>duik(en) toevoegen aan de trip hierboven</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Voeg duik(en) toe aan de trip hieronder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Trip met bovenstaande samenvoegen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Trip met onderstaande samenvoegen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>duik(en) verwijderen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>markeer duik(en) als ongeldig</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>geselecteerde duiken samenvoegen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Duik(en) opnieuw nummeren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>tijdstippen verschuiven</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>afbeeldingen laden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Afbeelding openen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1300,54 +1300,49 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Exporteer opmaak</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Wereldkaart</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Selectie</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Geselecteerde duiken</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Alle duiken</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1362,107 +1357,133 @@ duikcomputer wilt verwijderen?</translation> <translation>Algemene Export</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation>DiveShare</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation>Dieptes foto's</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Algemene Instellingen</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Subsurface Statistieken</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation>Jaarlijkse statistieken uitvoeren</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Exporteer enkel lijst</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Opmaakstijl opties</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Lettertype</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Lettertype grootte</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Thema</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Licht</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Zandkleurig</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF bestanden (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV bestanden (*.csv *.CSV)</translation> </message> @@ -1473,77 +1494,83 @@ duikcomputer wilt verwijderen?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Waarden gescheiden door komma's met de meest relevante informatie van het duikprofiel.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Zend de duikgegevens naar de divelogs.de website.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation>Verzend duikgegevens naar dive-share.appspot.com</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML export van duiklocaties op een wereldkaart.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Subsurface XML bestandsindeling.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation>Voeg dieptes waarop foto's genomen zijn toe aan het bestand.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Exporteer UDDF bestand als</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Exporteer CSV bestand als</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Wereldkaart exporteren</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML bestanden (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Exporteer Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML bestanden (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation>Bewaar dieptes waarop de foto's genomen zijn</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Exporteer HTML bestanden als</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Kan het bestand %s niet openen</translation> </message> @@ -1582,7 +1609,7 @@ duikcomputer wilt verwijderen?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Tijd</translation> </message> @@ -1608,25 +1635,25 @@ duikcomputer wilt verwijderen?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Scheiding tussen velden</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Eenheden</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metrisch</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperiaal</translation> </message> @@ -1641,100 +1668,160 @@ duikcomputer wilt verwijderen?</translation> <translation>Handmatige duiken</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation>Kies volgorde van dag, maand en jaar voor het datumformaat. De velden kunnen gescheiden worden door .-/.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Datumformaat:</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>dd.mm.jjjj</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation>mm/dd/jjjj</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation>jjjj-mm-dd</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Duik #</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation>Datum in dd.mm.jjjj, jjjj-mm-dd of mm/dd/jjjj formaat</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation>Duikduur in seconden of min:sec formaat</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Trefwoorden</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Locatie</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Max diepte</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Veld Configuratie</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Gemiddelde diepte</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Notities</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Gewicht</translation> </message> @@ -1846,77 +1933,92 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Diepte</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Tijd</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Druk</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Kleur</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Druk S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation>Omgevingsdruk</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Druk I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Ingevoerd door gebruiker</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Fles index</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Plafond</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>Gasverbruik</translation> </message> @@ -1967,127 +2069,127 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Waardering</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Diepte</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>Gasverbruik</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Gewicht (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Pak</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Fles</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>Gasverbruik (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Locatie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Diepte (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Temp (%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2191,54 +2293,54 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Fout</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Opnieuw</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Uemis duikcomputer zoeken</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Kies een bestand om duikcomputer log te downloaden</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Log bestanden (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Duiken worden NIET in de duiklijst geladen als u de libdivecomputer dump opslaat.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Kies een bestand voor de duikcomputer binaire dump</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Dump bestanden (*.bin)</translation> </message> @@ -2311,17 +2413,42 @@ duikcomputer wilt verwijderen?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation>Sleutel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Waarde</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2360,17 +2487,17 @@ duikcomputer wilt verwijderen?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation>Firmware bijwerken mislukt!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kan geen verbinding maken met de duikcomputer</translation> </message> @@ -2378,7 +2505,7 @@ duikcomputer wilt verwijderen?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Bewerk geselecteerde duiklocaties</translation> </message> @@ -2386,7 +2513,7 @@ duikcomputer wilt verwijderen?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Locatie:</translation> </message> @@ -2402,330 +2529,330 @@ duikcomputer wilt verwijderen?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Locatie</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Coördinaten</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Duikleider</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Trefwoorden</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Waardering</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Zicht</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Pak</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Duiknotities</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Lucht temp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Notities</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Uitrusting</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Gebruikte gassen</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Gasverbruik</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Max. diepte</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Luchtdruk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Duiktijd</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Totale tijd</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Gasverbruik</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation>Extra gegevens</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation>Bijkomende gegevens van duikcomputer</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Tijd</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Duikinformatie</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Interval</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>Gasverbruik</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Gem. diepte</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Zoutgehalte</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Statistieken</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Diepte</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Duiken</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Foto's</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Flessen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Gewichten</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation>Wijzigingen toepassen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation>Wijzigingen verwijderen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Fles toevoegen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation>Voeg gewichtssysteem toe</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Lucht temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Water temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Deze trip wordt bewerkt.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Meerdere duiken worden bewerkt.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Deze duik wordt bewerkt.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Trip notities</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Trip locatie</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Diepste duik</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Ondiepste duik</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation>Hoogste SAC van een duik</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation>Laagste SAC van een duik</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation>Gemiddelde SAC van de geselecteerde duiken</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation>Hoogste temperatuur</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation>Laagste temperatuur</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation>Gemiddelde temperatuur van de geselecteerde duiken</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation>Langste duik</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation>Kortste duik</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation>Gemiddelde duiktijd van de geselecteerde duiken</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2734,17 +2861,17 @@ worden uit lucht en: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>en</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Wijzigingen niet opslaan?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>U staat op het punt wijzigingen te verwijderen</translation> </message> @@ -2752,92 +2879,92 @@ worden uit lucht en: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>Bestand</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation>Exporteer logboek</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>pHe grafiek in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Berekening van alle compartimenten in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Door DC aangegeven plafond in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Berekend plafond in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Berekend plafond in 3m stappen in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Duikcomputer configureren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Duik opnieuw plannen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Toon/verberg hartslag</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>MOD in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>SAC in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Meetlat in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Details van het duikplan</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Afdrukken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2850,486 +2977,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>Toon</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Importeren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Nieuw logboek</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Nieuw</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>Logboek &Openen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Open</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>Bewaar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Opslaan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Bewaren als</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Opslaan als...</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>Sluiten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Sluiten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>Voorkeuren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>GPS gegevens importeren van Subsurface webservice</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>Kopieer duikcomponenten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>Plak duikcomponenten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>Profiel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>Alle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>Volgende Duikcomputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>Over Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>Wereldbol</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Importeren van divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>Volledig scherm</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Volledig scherm in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>Zoek naar updates</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>Exporeren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation>Toon/verberg pO₂ grafiek</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation>Toon/verberg pN₂ grafiek</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Grafiek schalen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation>Toon/verberg foto's</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation>Toon fles bar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>Duiklijst filteren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation>Weefselgrafiek tonen/verbergen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>Afdrukken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>Afsluiten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Importeren uit &duikcomputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>Hernummeren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>Apparaatnamen bewerken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>Duik toevoegen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Automatisch groeperen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>Jaarlijkse statistieken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>Duiklijst</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Vorige Duikcomputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Links</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Rechts</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>Handleiding</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>Duik Plannen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>Importeer logbestanden</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Importeer logboeken uit andere programma's</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Bestand openen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Annuleren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Runtime tabel afdrukken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Aanpassingen opslaan?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Bestand bewaren als</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Open duiklogboek</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation>Logboek bestanden (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran bestanden (*.can);;CSV bestanden (*.csv);;DiveLog.de bestanden (*.dld);;JDiveLog bestanden (*.jlb);;Liquivision bestanden (*.lvd);;MkVI bestanden (*.txt);;Suunto bestanden (*.sde *.db);;UDDF/UDCF bestanden (*.uddf *.udcf);;XML bestanden (*.xml);;Alle bestanden (*)</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Jaarlijkse statistieken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3337,12 +3469,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter toont %1 (van %2) duiken</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3400,387 +3572,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Standaardinstellingen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Eenheden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Grafiek</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Taal</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Netwerk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Lettertype</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Lettertype grootte</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Duiken</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Gebruik standaardinstelling</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animaties</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Snelheid</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Alle instellingen wissen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Zet alle voorkeuren terug naar hun originele waarden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Systeem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metrisch</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperiaal</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personaliseren</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Diepte</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>voet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Systeem standaardinstelling</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Proxy type</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Poort</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Authenticatie vereist</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Gebruikersnaam</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Wachtwoord</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Druk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Lijsten en tabellen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Standaard duikbestand</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Ongeldig scherm</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Standaard fles</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Gebruik standaard fles</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface webservice</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Standaard gebruikers ID</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Bewaar gebruikers ID lokaal?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Tijdseenheden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minuten</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Seconden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Toon</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow op max diepte</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Allerlei</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Instellingen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Stijg-/daalsnelheid noemer</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Drempelwaarde wanneer pO₂ getoond wordt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Drempelwaarde wanneer pN₂ getoond wordt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Drempelwaarde wanneer pHe getoond wordt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Max pO₂ wanneer MOD getoond wordt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Toon door duikcomputer aangegeven plafond in rood</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Toon niet gebruikte flessen in het Uitrusting tabblad</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Toon gemiddelde diepte</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Geen proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Systeem proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Herstarten noodzakelijk</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Om een nieuwe taal te laden dient u Subsurface te herstarten.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Alle voorkeuren van Subsurface worden teruggezet naar hun originele waarden wanneer u op OK klikt. Dit zal onmiddellijk gebeuren.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Standaard logboek openen</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> @@ -3907,72 +4094,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>onbekend</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Duik #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Max diepte: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Duur: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Verbruikt gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Trefwoorden:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>Gasverbruik:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Gewichten:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Nota's:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Duikpak:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Zichtbaarheid:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Beoordeling:</translation> </message> @@ -3980,103 +4167,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 van %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>NDL / TTS wordt niet getoond omdat de berekening te lang duurt</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Eerste duikcomputer aanmaken</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Deze duikcomputer verwijderen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Gaswissel toevoegen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation> (Fles %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation>Voeg set-point wissel toe</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Bladwijzer toevoegen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Gebeurtenis verwijderen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Gelijkaardige gebeurtenissen verbergen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Naam bewerken</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <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="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Toon alle gebeurtenissen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Gebeurtenissen verbergen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Alle %1 gebeurtenissen verbergen?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Geselecteerde gebeurtenis verwijderen?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Naam bladwijzer bewerken</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Naam:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Deze naam is te lang!</translation> </message> @@ -4104,22 +4291,22 @@ p, li { white-space: pre-wrap; } <translation>Sluiten</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Gemiddelde</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Kleinste</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Grootste</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Verplaats de kaart en dubbelklikk om de duiklocatie te selecteren</translation> </message> @@ -4187,12 +4374,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kon geen verbinding maken met de duikcomputer.</translation> </message> @@ -4206,12 +4393,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Nieuw beginnummer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Nieuw nummer</translation> </message> @@ -4219,12 +4406,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kon geen verbinding maken met de duikcomputer.</translation> </message> @@ -4303,12 +4490,12 @@ p, li { white-space: pre-wrap; } <translation>Welke datum en tijd worden weergegeven in de afbeelding?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Afbeelding openen</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4358,6 +4545,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4381,8 +4682,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform duiklog programma<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, en anderen, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4436,7 +4737,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Duikpakken:</translation> </message> @@ -4452,11 +4753,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Fles toevoegen</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4466,7 +4762,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Trefwoorden:</translation> </message> @@ -4516,54 +4812,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Zoek naar updates.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface kon niet zoeken naar updates.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>De volgende fout trad op:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Controleer uw internetverbinding.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation>U gebruikt de meest recente versie van Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Er is een nieuwe versie van Subsurface beschikbaar.<br/>Klik op:<br/><a href="%1">%1</a><br/> om te downloaden.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation>Er is een nieuwe versie van Subsurface beschikbaar.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation>De nieuwste versie is %1. Neem contact op met de verdeler van uw besturingssysteem voor updates.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation>De nieuwste officiele versie is</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Bij het zoeken naar updates trad een fout op.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4583,64 +4899,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>We zouden graag meer weten over onze gebruikers, hun voorkeuren en hun gewoontes. Neem a.u.b. even de tijd om dit formulier in te vullen en het naar het Subsurface team te verzenden. Selecteer alle opties die van toepassing zijn.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Gebruikersenquete</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Subsurface gebruikersenquete</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Recreatieve Duiker</translation> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Technische duiker</translation> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Geïnteresseerd in duikplanning</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Ik download duiken van een ondersteunde duikcomputer</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Ik importeer duiken uit andere software / bronnen</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Ik voer duiken met de hand in</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Ik gebruik de Android toepassing om duiklocaties bij te houden</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Suggesties (in het Engels) kunt u in het volgende veld geven</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>De volgende informatie over uw systeem zullen eveneens verzonden worden</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4813,12 +5139,19 @@ Besturingssysteem CPU %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kon geen verbinding maken met de duikcomputer.</translation> </message> @@ -4826,79 +5159,79 @@ Besturingssysteem CPU %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Jaar > Maand / Trip</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Duur Totaal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Kortste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Langste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Diepte (%1) Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>Gasverbruik (%1) Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4914,13 +5247,13 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4931,16 +5264,16 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4966,120 +5299,120 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>US pond</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) of (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>lucht</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>Geïntegreerd</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>riem</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>enkel</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>backplate-gewicht</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Fout bij lezen van '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>CSV bestand %s kan niet geopend worden; gebruik het Importeer logbestanden menu</translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon import mislukt: kan '%s' niet lezen</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation>Positie mondstuk OC</translation> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation>Positie mondstuk CC</translation> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation>Positie mondstuk onbekend</translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation>Positie mondstuk niet aangesloten</translation> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation>Uitschakelen</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation>O₂ calibratie mislukt</translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation>O₂ calibratie</translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation>Geen duikcomputer gevonden voor bestand '%s'</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Het maximum aantal kolommen bij CSV importeren is %d</translation> </message> @@ -5098,7 +5431,7 @@ Maximum</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation>batterij</translation> </message> @@ -5112,7 +5445,7 @@ Maximum</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>opstijging</translation> @@ -5159,7 +5492,7 @@ Maximum</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5315,42 +5648,42 @@ Maximum</translation> <translation>Fout bij het verwerken van de samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Event: wachten op handeling van gebruiker</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Fout bij het registreren van de event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Fout bij het registreren van de cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Fout bij importeren van duikdata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Kan geen context creëren voor libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Fout bij openen van %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Privileges ontoereikend voor toegang tot het toestel %s %s (%s)</translation> </message> @@ -5369,222 +5702,254 @@ Maximum</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Database-query get_events mislukt. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Database query get_tags mislukt. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Databaseconnectie is mislukt '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Database-query mislukt: '%s' -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Database query get_cylinders mislukt. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. </source> - <translation>Database query get_changes mislukt. + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Databaseconnectie is mislukt '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Database query get_profile_sample mislukt. + <translation>Database-query mislukt: '%s' </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Kan de stylesheet %s niet openen</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Gas %s kan niet gevonden worden</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Teveel gasmengsels</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Decompressieberekeningen gestopt omdat ze te lang duren</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>gebaseerd op GFlow = %d en GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurface duikplan</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>diepte</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>duur</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <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="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <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="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Gaswissel naar %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Gaswissel naar %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gasverbruik (uitgezonderd CCR segmenten):</translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Gasverbruik:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Waarschuwing:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>NIET-AANSPRAKELIJKHEIDSVERKLARING / WAARSCHUWING: DIT IS EEN NIEUWE IMPLEMENTATIE VAN HET BUHLMANN ALGORITME EN EEN IMPLEMENTATIE VAN EEN DUIKPLANNER DIE HIEROP GEBASEERD IS. BEIDE IMPLEMENTATIES HEBBEN MAAR EEN BEPERKTE MATE VAN TESTEN ONDERGAAN. WIJ RADEN MET KLEM AF DUIKEN UIT TE VOEREN DIE GEBASEERD ZIJN OP DE RESULTATEN DIE HIER GETOOND WORDEN.</translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <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="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <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="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s van %s (%.0f%s/%.0f%s in geplande opstijging)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s gedurende geplande opstijging) van %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>EAN</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5593,70 +5958,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO₂%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN₂%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5665,7 +6030,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5674,162 +6039,168 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Veiligheidsstop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Veiligheidsstop: onbek tijd @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: onbek tijd @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>In deco (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Berekend plafond %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Compartiment %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>hartslag: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>koers: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 duiken)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 duik)</translation> </message> @@ -5994,97 +6365,97 @@ EADD: %d%s <translation>(geen duiken)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Zo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Ma</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Di</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Wo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Do</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Vr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Za</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>mei</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>sept</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>dec</translation> </message> diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index e17d5d797..99ec781a8 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Osoba:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>Wyszukiwanie partnerów i divemasterów</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Nie można zapisać kopii pliku %1. Komunikat błędu: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Nie można otworzyć kopii zapasowej pliku : %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation>Konfiguracja komputera odczytana poprawnie</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Pomyślnie zapisano ustawienia w urządzeniu</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Oprogramowanie urządzenia pomyślnie zaktualizowane</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Ustawienie urządzenia pomyślnie zresetowane </translation> </message> @@ -847,72 +847,72 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Pliki kopii zapasowych (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>Wystąpił błąd podczas zapisywania pliku kopii zapasowej. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Pomyślnie utworzono kopię zapasową.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>Twoje ustawienia zostały zapisane do: %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation>Tworzy kopię ustawień komputera nurkowego</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation>Błąd kopii zapasowej XML</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation>Przywraca ustawienia komputera nurkowego</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation>Błąd przywracania XML</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Wystąpił błąd podczas przywracania z pliku kopii zapasowej. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>Pomyślnie przywrócono ustawienia</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>Twoje ustawienia zostały pomyślnie przywrócone.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Wybierz plik z aktualizacją</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>Wszystkie pliki (*.*)</translation> </message> @@ -1071,22 +1071,22 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>ID urządzenia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Nazwa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Kliknięcie tu usunie ten komputer nurkowy.</translation> </message> @@ -1094,18 +1094,18 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Przejście na obieg otwarty</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation> początek</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation> koniec</translation> @@ -1114,97 +1114,97 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>Nr</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Ocena</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Głębokość(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Temperatura(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Balast(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Skafander</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Butle</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Miejsce</translation> </message> @@ -1212,87 +1212,87 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Rozwiń wszystkie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Zwiń wszystkie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Zwiń pozostałe</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Usuń nurkowanie(a) z grupy</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Utwórz nową grupę powyżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Dodaj nurkowanie(a) do grupy powyżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Dodaj nurkowanie(a) do grupy poniżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Połącz grupę z grupą powyżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Połącz grupę z grupą poniżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Usuń nurkowanie(a)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Oznacz nurkowanie(a) jak niepoprawne</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Połącz wybrane nurkowania</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Zmień numerację</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Zmień czas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Dodaj zdjęcia</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Dodawanie zdjęć</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1300,54 +1300,49 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Format danych</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Mapa Świata</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Wybór</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Wybrane nurkowania</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Wszystkie nurkowania</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1362,107 +1357,133 @@ wybrany komputer nurkowy?</translation> <translation>Podstawowy eksport</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation>DiveShare</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation>Głębokości zdjęć</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Ogólne</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Zachowaj numerację</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation>Eksport statystyk rocznych</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Eksportuj tylko listę</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Ustawienia stylu</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Czcionka</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Rozmiar czcionki</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Motyw</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Światło</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Piasek</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Pliki UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>pliki CSV (*.csv *.CSV)</translation> </message> @@ -1473,77 +1494,83 @@ wybrany komputer nurkowy?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Lista oddzielonych przecinkami najważniejszych informacji z profilu nurkowania. </translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Wysyła dane na stronę divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation>Wysyła dane do strony dive-share.appspot.com</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Eksport danych o miejscach nurkowych w HTML z zaznaczeniem ich na mapie świata. </translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Format XML używany przez Subsurface.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation>Zapisuje głębokości zdjęć do pliku.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Eksportuj plik UDDF jako</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Eksportuj plik CSV jako</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Eksport mapy świata</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>Pliki HTML (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Eksport Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>Pliki XML (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation>Zapisz głębokości zdjeć</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Eksportuj pliki HTML jako</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Nie można otworzyć pliku %s</translation> </message> @@ -1582,7 +1609,7 @@ wybrany komputer nurkowy?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Czas</translation> </message> @@ -1608,25 +1635,25 @@ wybrany komputer nurkowy?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Separator danych</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Jednostki</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metryczny</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperialny</translation> </message> @@ -1641,100 +1668,160 @@ wybrany komputer nurkowy?</translation> <translation>Nurkowania dodane ręcznie</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation>Wybierz kolejność pól w formacie daty. Jako separator może być użyty dowolny ze znaków .-/.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Format daty</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>dd.mm.yyyy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation>mm/dd/yyyy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation>yyyy-mm-dd</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Nurkowanie nr</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation>Data w formacie dd.mm.yyyy, yyyy-mm-dd lub mm/dd/yyyy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation>Długość nurkowania w sekundach lub w formacie min:sek</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Czas</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Tagi</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Miejsce</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Głębokość maksymalna</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Konfiguracja pól</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Głębokość średnia</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Partner</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Opis</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Balast</translation> </message> @@ -1846,77 +1933,92 @@ wybrany komputer nurkowy?</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Głębokość</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Czas</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Ciśnienie</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Kolor</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Ciśnienie S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation>Cisnienie otoczenia</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Ciśnienie I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Podane przez użytkownika</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Numer butli</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Sufit</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1967,127 +2069,127 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>Nr</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Ocena</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Głębokość</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Balast</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Balast(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Skafander</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Butle</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Miejsce</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Głębokość(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Temperatura(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2191,54 +2293,54 @@ wybrany komputer nurkowy?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Ponów</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Wykryj komputer Uemis</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Wybierz plik używany do logowania postępu pobierania danych</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Pliki logów (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Użycie libdivecomputer w trybie diagnostycznym spowoduje, że pobrane nurkowania NIE ZOSTANĄ dodane do listy nurkowań.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Wybierz plik do którego zapisane zostaną dane binarne</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Pliki binarne (*.bin)</translation> </message> @@ -2311,17 +2413,42 @@ wybrany komputer nurkowy?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation>Klucz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Wartość</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2360,17 +2487,17 @@ wybrany komputer nurkowy?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation>Aktualizacja oprogramowania nieudana!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie udało się połączyć z komputerem nurkowym.</translation> </message> @@ -2378,7 +2505,7 @@ wybrany komputer nurkowy?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Wskaż miejsce zaznaczonych nurkowań</translation> </message> @@ -2386,7 +2513,7 @@ wybrany komputer nurkowy?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Miejsce:</translation> </message> @@ -2402,331 +2529,331 @@ wybrany komputer nurkowy?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Miejsce</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Współrzędne</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Partner</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Tagi</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Ocena</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Widzialność</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Skafander</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Notatki</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Temp. powietrza</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Temp. wody</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Opis</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Wyposażenie</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Dostępne gazy</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Zużyty gaz</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Maks. głębokość</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Ciśn. atmosferyczne</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Czas nurkowania</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Całkowity czas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Zużycie gazu </translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation>Dodatkowe</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation>Dodatkowe dane z komputera nurkowego</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Czas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Informacje</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Przerwa powierzchniowa</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Śr. głębokość </translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Zasolenie</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Statystyka</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Głębokość</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Czas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Nurkowania</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Zdjęcia</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Butle</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Balast</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation>Zastosuj zmiany</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation>Porzuć zmiany</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Dodaj butlę</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation>Dodaj balast</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Temp. powietrza [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Temp. wody [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Ta grupa nurkowań jest obecnie edytowana.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Kilka nurkowań jest obecnie edytowanych.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>To nurkowanie jest obecnie edytowane.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Opis nurkowań</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Miejsce nurkowań</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Najgłębsze nurkowanie</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Najpłytsze nurkowanie</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation>Najwyższy SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation>Najniższy SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation>Średni SAC z wybranych nurkowań</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation>Najwyższa temperatura</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation>Najniższa temperatura</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation>Średnia temperatura z wybranych nurkowań</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation>Najdłuższe nurkowanie</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation>Najkrótsze nurkowanie</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation>Średnia długość wybranych nurkowań</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2735,17 +2862,17 @@ z powietrza przy użyciu: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>oraz </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Porzucić zmiany?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Masz zamiar porzucić zmiany.</translation> </message> @@ -2753,92 +2880,92 @@ z powietrza przy użyciu: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>Plik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation>Eksport nurkowań</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Pokazuj wykres pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Obliczenia dla wszystkich tkanek</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Pokazuj sufit z komputera nurkowego</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Pokazuj obliczony sufit</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Pokazuj NDL / TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Pokazuj obliczony sufit z krokiem 3m</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Konfiguruj komputer nurkowy</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Zaplanuj nurkowanie ponownie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Pokazuj tętno</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>Pokazuj MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Pokazuj EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>Pokazuj SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Pokazuj linijkę</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Plan nurkowy</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Drukuj</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2851,486 +2978,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>Widok</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>Import</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>Nowy logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Nowy</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>Otwórz logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Otwórz</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>Zapisz</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Zapisz</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Zapisz jako</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Zapisz jako</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>Zamknij</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Zamknij</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>Ustawienia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importuj dane GPS z usługi sieciowej Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>Kopiuj parametry nurkowania</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>Wklej parametry nurkowania</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>Wszystko</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>Następny komputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>O Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>Mapa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Importuj z divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>Pełen ekran</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Przełącz pełen ekran</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>Sprawdź aktualizacje</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>Eksport</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation>Pokazuj wykres pO₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation>Pokazuj wykres pN₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Skalowanie wykresu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation>Pokazuj zdjęcia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation>Pokazuj pasek gazu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>Filtrowanie nurkowań</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation>Pokazuj nasycenie tkanek</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>Drukuj</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>Wyjdź</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Importuj z komputera nurkowego</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>Zmień numerację</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>Edycja nazw komputerów nurkowych</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>Dodaj nurkowanie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Automatycznie grupuj</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>Statystyka roczna</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>Lista nurkowań</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Poprzedni komputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>W lewo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>W prawo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>Instrukcja obsługi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>Zaplanuj nurkowanie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>Importowanie logów nurkowych</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Importuj logi z innej aplikacji</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Otwórz plik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Anuluj</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Drukowanie planu nurkowego</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Zapisać zmiany?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Zapisz plik jako</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Otwórz plik z logiem</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation>Logi nurkowe (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Pliki Cochran (*.can);;Pliki CSV (*.csv);;Pliki DiveLog.de (*.dld);;Pliki JDiveLog (*.jlb);;Pliki Liquivision (*.lvd);;Pliki MkVI (*.txt);;Pliki Suunto (*.sde *.db);;Pliki UDDF/UDCF (*.uddf *.udcf);;Pliki XML (*.xml);;Wszystkie pliki (*)</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Statystyka roczna</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Pliki Subsurface XML (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3338,12 +3470,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filtr pokazuje %1 (z %2) nurkowań</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3401,387 +3573,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Ogólne</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Jednostki</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Wykres</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Język</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Sieć</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Czcionka</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Rozmiar czcionki</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Nurkowania</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Używaj domyślnego</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animacje</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Prędkość</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Kasowanie ustawień</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Przywróć wszystkie ustawienia do ich wartości domyślnych </translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metryczny</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperialny</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Dostosuj</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Głębokość</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>metry</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>stopy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>litry</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>stopy sześcienne (cu ft)</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>stopnie Celsjusza</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>stopnie Fahrenheita</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Domyślne ustawienia systemu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Rodzaj proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Wymaga autentykacji</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Użytkownik</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Hasło</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filtr</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Ciśnienie</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Listy i tabele</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Domyślny plik nurkowań</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Pokazuj niepoprawne nurkowania</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Domyślna butla</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Użyj domyślnej butli</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Usługa Internetowa Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Domyślne ID Użytkownika</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Zapisywać ID użytkownika do pliku?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Objętość</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Balast</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Jednostki czasu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>minuty</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>sekundy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Pokaż</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow na maksymalnej głębokości</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Różne</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Ustawienia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Mianownik szybkości zanurzania/wynurzania </translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Próg ostrzeżenia dla pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Próg ostrzeżenia dla pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Próg ostrzeżenia dla pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Max ppO₂ gdy wyświetlany jest MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Pokazuj sufit z komputera nurkowego na czerwono</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Pokazju nieużywane butle w zakładce Wyposażenie</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Pokazuj głębokość średnią</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Bez proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Systemowe proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>Proxy HTTP</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Wymagane ponowne uruchomienie</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Aby użyć nowego języka musisz ponownie uruchomić Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Jeśli klikniesz OK, wszystkie ustawienia Subsurface zostaną przywrócone do ich wartości początkowych - z natychmiastowym skutkiem.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Pliki Subsurface XML (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Otwórz domyślny plik</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> @@ -3908,72 +4095,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>nieznana</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Nurkownie #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Max głębokość: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Czas: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Użyty gaz:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Tagi:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Balast:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Opis:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Skafander:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Widzialność:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Ocena:</translation> </message> @@ -3981,103 +4168,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Pokazywanie NDL / TTS zostało wyłączone z powodu zbyt długiego czasu obliczeń.</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Ustaw jako pierwszy komputer nurkowy</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Usuń ten komputer nurkowy</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Dodaj zmianę gazu</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation> (Butla %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation>Dodaj zmianę set-point</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Dodaj notatkę</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Usuń znacznik</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Ukryj podobne znaczniki</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Zmień nazwę</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <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="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Odkryj wszystkie znaczniki</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Ukrywanie wydarzeń</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Ukyć wszystkie wydarzenia typu %1?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Usunąć wybrane wydarzenie?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Zmień nazwę wydarzenia</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Własna nazwa:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Nazwa jest za długa!</translation> </message> @@ -4105,22 +4292,22 @@ p, li { white-space: pre-wrap; } <translation>Zamknij</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>średnia</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>min.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>max.</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Przesuń mapę i wskaż lokalizację dwuklikiem</translation> </message> @@ -4188,12 +4375,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie udało się połączyć z komputerem nurkowym.</translation> </message> @@ -4207,12 +4394,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Nowy numer początkowy</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Nowy numer</translation> </message> @@ -4220,12 +4407,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie udało się połączyć z komputerem nurkowym.</translation> </message> @@ -4304,12 +4491,12 @@ p, li { white-space: pre-wrap; } <translation>Jaka data i godzina jest na zdjęciu?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Otwórz zdjęcie</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4359,6 +4546,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4382,8 +4683,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Wieloplatformowy log nurkowy<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava i inni, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4437,7 +4738,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Skafandry:</translation> </message> @@ -4453,11 +4754,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Dodaj butlę</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4467,7 +4763,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Tagi:</translation> </message> @@ -4517,54 +4813,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Sprawdzanie dostępności aktualizacji.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Nie udało się sprawdzić dostępności aktualizacji.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Natrafiono na następujący błąd:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Sprawdź proszę swoje połączenie z Internetem.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation>Używasz najnowszej wersji Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Nowa wersja Subsurface jest dostępna.<br/>Kliknij na:<br/><a href="%1">%1</a><br/> aby ją pobrać.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation>Nowsza wersja Subsurface jest dostępna.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation>Najnowsza wersja to %1, sprawdź dostępność aktualizacji u dostawcy swojego systemu operacyjnego.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation>Najnowsza wersja to </translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Wystąpił błąd podczas sprawdzania dostępności aktualizacji.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4584,64 +4900,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Chcielibyśmy dowiedzieć się więcej o naszych użytkownikach, ich preferencjach i sposobie korzystania z programu Subsurface. Prosimy Cię o poświęcenie kilku chwil na wypełnienie tej ankiety i podzielenie się informacjami z ekipą Subsurface. Proszę zaznaczyć wszystkie opcje, które Ciebie dotyczą.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Ankieta</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Ankieta Subsurface</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Jestem płetwonurkiem rekreacyjnym</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Jestem płetwonurkiem technicznym</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Jestem zainteresowany(a) planowaniem nurkowań</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Pobieram dane z komputerów nurkowych</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Importuję dane z innych programów / innych źródeł </translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Ręcznie dodaję nurkowania</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Używam aplikacji Subsurface na Androida do śledzenia lokalizacji miejsc nurkowych</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Wpisz swoje uwagi i sugestie (po angielsku) w poniższym polu</translation> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Zostaną dołączone także następujące informacje o Twoim systemie</translation> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4814,12 +5140,19 @@ Architektura OS CPU: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie udało się połączyć z komputerem nurkowym.</translation> </message> @@ -4827,74 +5160,74 @@ Architektura OS CPU: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Rok > Miesiąc / grupa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>Ilość</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Czas trwania całkowity</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation>średni</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation>najkrótszy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation>najdłuższy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Głębokość (%1) średnia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation>minimalna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation>maksymalna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) średni</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temperatura (%1) @@ -4910,13 +5243,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4927,16 +5260,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4962,120 +5295,120 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) lub (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>powietrze</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>zintegrowany</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>pas balastowy</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>na kostkach</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>na płycie</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>doczepiany</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Błąd odczytu '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>Nie można otworzyć pliku CSV %s; Użyj opcji Importowanie logów nurkowych.</translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Błąd importu: nie można odczytać '%s'</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation>Pozycja ustnika: OC</translation> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation>Pozycja ustnika: CC</translation> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation>Pozycja ustnika: nieznana</translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation>Pozycja ustnika: nie podłączony</translation> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation>Wyłączenie</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation>Kalibracja O₂ nieudana</translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation>Kalibracja O₂ </translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation>Nie znaleziono komputera nurkowego pasującego do pliku '%s'</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksymalna ilość kolumn danych przy imporcie CSV to %d</translation> </message> @@ -5094,7 +5427,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation>bateria</translation> </message> @@ -5108,7 +5441,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>wynurzanie</translation> @@ -5155,7 +5488,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5311,42 +5644,42 @@ Maximum</source> <translation>Błąd podczas przetwarzania próbek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Oczekiwanie na działanie użytkownika</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), numer seryjny=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Błąd rejestracji uchwytu (event handler)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Błąd rejestracji uchwytu (cancellation handler)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Błąd podczas importowania danych</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Nie można utworzyć kontekstu libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Nie udało się otworzyć %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Brak uprawnień by otworzyć urządzenie %s %s (%s)</translation> </message> @@ -5365,222 +5698,254 @@ Maximum</source> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Zapytanie bazy danych get_events nie powiodło się.⏎ -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Zapytanie bazy danych get_tags nie powiodło się. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Błąd połączenia z bazą danych '%s'.⏎ -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Błąd komunikacji z bazą danych '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Zapytanie bazy danych get_cylinders nie powiodło się. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. </source> - <translation>Zapytanie bazy danych get_changes nie powiodło się. + <translation>Błąd połączenia z bazą danych '%s'.⏎ </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Zapytanie bazy danych get_profile_sample nie powiodło się. + <translation>Błąd komunikacji z bazą danych '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Nie można otworzyć arkusza stylów %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Nie można znaleźć gazu %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Zbyt wiele rodzajów gazu</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Obliczanie dekompresji przerwane z powodu zbyt długiego czasu.</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>w oparciu o GFlow = %d i GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Plan nurkowania Subsurface </translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>głębokość</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>czas trwania</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>gaz</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <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="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <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="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Zmiana gazu na %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Zmiana gazu na %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Zużycie gazu (nie uwzględnia CCR):</translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Zużycie gazu:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Ostrzeżenie:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>OSTRZEŻENIE: TEN PLANER POSŁUGUJE SIĘ IMPLEMENTACJĄ ALGORYTMU BUHLMANNA, KTÓRA JEST NOWA I ZOSTAŁA PRZETESTOWANA W BARDZO OGRANICZONYM ZAKRESIE. ZDECYDOWANIE ODRADZAMY PLANOWANIE NURKOWANIA JEDYNIE W OPARCIU O REZULTATY DZIAŁANIA TEGO PROGRAMU.</translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <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="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <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="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s gazu %s (%.0f%s/%.0f%s podczas wynurzania)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s podczas wynurzania) gazu %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5589,70 +5954,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5661,7 +6026,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5670,35 +6035,35 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Przystanek bezp.: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Przystanek bezp.: nieznany czas @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: nieznany czas @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>dekompresja @@ -5706,127 +6071,133 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (obliczone) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>dekompresja (obliczone) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Obliczony sufit: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tkanka %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>tętno: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>kurs: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sGł:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sGł:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dives)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 nurkowanie)</translation> </message> @@ -5991,97 +6362,97 @@ EADD: %d%s <translation>(brak nurkowań)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Nie</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Pon</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Wto</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Śro</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Czw</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Pią</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Sob</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Sty</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Lut</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Kwi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Maj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Cze</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Lip</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Sie</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Wrz</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Paź</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Lis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Gru</translation> </message> diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index 7d104ecc4..1a2e23a50 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1069,22 +1069,22 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>ID do dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Apelido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Clicar aqui removerá os computadores de mergulho</translation> </message> @@ -1092,18 +1092,18 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Troca de emergência para circuito aberto</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>início</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>fim</translation> @@ -1112,97 +1112,97 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Roupa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Cilindro</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>CNS Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Local</translation> </message> @@ -1210,87 +1210,87 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Esconder todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Esconder outros</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Remover mergulhos de viagem</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Criar viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Adicionar mergulhos para a viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Adicionar mergulhos para viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Juntar viagem com viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Juntar viagem com viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Apagar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Marcar megulho(s) como inválidos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Juntar mergulhos selecionados</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Renumerar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Deslocar tempo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Carregar imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Abrir imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Imagens (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1298,54 +1298,49 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Formato de exportação</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Globo</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Seleção</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Mergulhos selecionados</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Todos os mergulhos</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1360,107 +1355,133 @@ o computador de mergulho selecionado?</translation> <translation>Exportações Gerais</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Configurações Gerais</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Numeros do Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Exportar apenas a lista</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Opções de estilo</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Fonte</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Tamanho da fonte</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Leve</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Areia</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Arquivos UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>Arquivos CSV (*.csv *.CSV)</translation> </message> @@ -1471,77 +1492,83 @@ o computador de mergulho selecionado?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Arquivo de texto separado por virgulas que incluem as informações mais relevantes do mergulho</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Enviar os dados para o site do divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Exportação HTML de pontos de mergulho visualizados no mundo</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Formato nativo do Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Exportar arquivo UDDF como</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Exportar arquivo CSV como</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Exportar mapa do mundo</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>Arquivos HTML (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Exportar XML do Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>Arquivos XML (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Exportar arquivo HTML como</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Não é possivel abrir o arquivo %s</translation> </message> @@ -1580,7 +1607,7 @@ o computador de mergulho selecionado?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Horário</translation> </message> @@ -1606,25 +1633,25 @@ o computador de mergulho selecionado?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Separador de campo</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Unidades</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Métrico</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperial</translation> </message> @@ -1639,100 +1666,160 @@ o computador de mergulho selecionado?</translation> <translation>Mergulhos manuais</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Mergulho nº</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Rótulos</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Profundidade máxima</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Configuração de campo</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Profundidade média</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Parceiro</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Notas</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Peso</translation> </message> @@ -1844,77 +1931,92 @@ o computador de mergulho selecionado?</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Horário</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Pressão</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Cor</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Pressão S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Pressão I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Entrado pelo usuário</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Indice do Cilindro</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Teto</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1965,127 +2067,127 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Roupa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Cilindro</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>CNS Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2189,54 +2291,54 @@ o computador de mergulho selecionado?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Tentar novamente</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Encontrar computador de mergulho Uemis</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Escolha o arquivo para recebimento do arquivo de log do computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Arquivos de log (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Ao salvar a saída da biblioteca libdivecomputer as informações dos mergulhos recebidos NÃO serão gravadas na lista de mergulhos.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Escolha o arquivo onde gravar a saída binária do computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Arquivos de saída (*.bin)</translation> </message> @@ -2309,17 +2411,42 @@ o computador de mergulho selecionado?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2358,17 +2485,17 @@ o computador de mergulho selecionado?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2376,7 +2503,7 @@ o computador de mergulho selecionado?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Editar a localização dos mergulhos selecionados</translation> </message> @@ -2384,7 +2511,7 @@ o computador de mergulho selecionado?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2400,330 +2527,330 @@ o computador de mergulho selecionado?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Coordenadas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Parceiro</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Rótulos</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Visibilidade</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Roupa</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Notas do mergulho</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Temperatura do ar</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Temperatura da água</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Notas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Equipamento</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Gases utilizados</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Gas consumido</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Profundidade máxima</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Pressão do ar</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Tempo de mergulho</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Tempo total</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Consumo de gás</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Horário</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Informações do Mergulho</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Intervalo</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Profundidade Média</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Salinidade</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Estatísticas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Mergulhos</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Fotos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Cilindros</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Lastro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Temperatura do Ar [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Temperatura da água [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Esta viagem está sendo editada.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Vários mergulhos estão sendo editados.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Este mergulho está sendo editado.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Notas da viagem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Local do mergulho</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Mergulho mais profundo</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Mergulho mais raso</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2732,17 +2859,17 @@ misturados com ar usando: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>e</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Descartar alterações?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Você está prestes a eliminar suas alterações.</translation> </message> @@ -2750,92 +2877,92 @@ misturados com ar usando: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>A&rquivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Alterna gráfico pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Alterna calcular todos os tecidos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Alterna teto calculado pelo computador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Alterna teto calculado</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Alterna NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Alterna teto calculado com incrementos de 3m</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Alterna batimentos cardiacos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>alterna MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Alterna EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>alterna taxa SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Anternar visualização da régua</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Detalhes do planejamento</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Imprimir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2848,486 +2975,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Ver</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Ajuda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Importar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Novo logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Novo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Abrir logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Gravar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Salvar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Sal&var como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Salvar como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>Fe&char</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Fechar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>P&referencias</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importar dados de &GPS pelo web service do Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>&Perfil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>&Informações</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>&Todos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>Próximo Computador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>&Sobre o Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>&Globo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Importar de &divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>&F Tela Cheia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Alternar em Tela Cheia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>&Checar por updates</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>&Exportar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Imprimir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>%Fechar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Importar do &computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>&Editar nomes dos dispositivos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>&Adicionar mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Auto a&grupar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>Estatisticas Anuais</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>Lista de Mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Computador de mergulho anterior</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Esquerda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Direita</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>Manual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>Planejador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>Importar arquivos de mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Importar arquivos de mergulho de outros programas</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Imprimir tabela</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Salvar Alteraḉões?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Salvar arquivo como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Estatisticas Anuais</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3335,12 +3467,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3398,387 +3570,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Padrões</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Unidades</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Gráfico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Língua</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Rede</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Fonte</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Tamanho da fonte</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Mergulhos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animações</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Velocidade</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Apagar todas as preferências</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Voltar aos padrões</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Métrico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personalizar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>metro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>pé</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>litro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>pé cúbico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Tipo de Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Porta</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Requer Autenticação</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Nome de usuario</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Senha</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filtro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Pressão</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Unidades de tempo</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minutos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Segundos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Mostrar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFlow à profundidade máxima</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Diversos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Preferências</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Sem proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Proxy do sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>Proxy HTTP</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Reinicialização necessária</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Para carregar corretamente uma nova língua você deve reiniciar o Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Aviso</translation> </message> @@ -3905,72 +4092,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Mergulho #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Profundidade máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Duração: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Tags:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Lastro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Companheiro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Roupa:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Visibilidade:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Classificação:</translation> </message> @@ -3978,103 +4165,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 de %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Marcar como primeiro computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Apagar este computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Esconder eventos semelhantes</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Editar nome</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Mostrar todos os eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Esconder todos os %1 eventos?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Remover o evento selecionado?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Editar nome do favorito</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Apelido:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4102,22 +4289,22 @@ p, li { white-space: pre-wrap; } <translation>Fechar</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Média</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Mínimo</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Máximo</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Mova o mapa e dê um duplo clique para definir a localização do ponto de mergulho.</translation> </message> @@ -4185,12 +4372,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4204,12 +4391,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Novo número inicial</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Novo numero</translation> </message> @@ -4217,12 +4404,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4301,12 +4488,12 @@ p, li { white-space: pre-wrap; } <translation>Qual dia e hora são mostrados na imagem?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Imagens (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4356,6 +4543,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4379,8 +4680,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Gerenciador de mergulhos multiplataforma<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, e outros 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4434,7 +4735,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -4450,11 +4751,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4464,7 +4760,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4514,54 +4810,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Buscar atualizações.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface não conseguiu localizar updates</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>O seguinte erro ocorreu</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Por favor, verifique sua conexão a internet</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Houve um erro enquanto buscavamos pela atualização.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4581,64 +4897,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Adorariamos saber mais sobre nossos usuarios, suas preferencias e seus habitos de uso. Por favor, perca uns minutinhos para preencher esse questionario e enviar ao time do Subsurface, Selecione todas as opções aplicáveis.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Interessado em planejamento de mergulhos</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Eu estou carregando mergulhos de um computador suportado pelo subsurface</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Eu estou importando mergulhos de outros programas</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Eu estou entrando mergulhos manualmente</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Eu uso o aplicativo android para adicionar coordenadas nos mergulhos</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Por favor escreva sugestões no campo abaixo.</translation> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>As seguintes informações sobre seu sistema também serão enviadas</translation> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4810,12 +5136,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4823,79 +5156,79 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Ano > Mês / Viagem</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Duração Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Mais curto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Mais longo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Profundidade (%1) Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Mínimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Médio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4911,13 +5244,13 @@ Médio</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4928,16 +5261,16 @@ Médio</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>pé(s)</translation> </message> @@ -4963,120 +5296,120 @@ Médio</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>ar</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integrado</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>cinto</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>tornozelo</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>lastro no arnês</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Falha na leitura de '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>O número máximo de colunas suportadas ao importar arquivos CSV é %d</translation> </message> @@ -5095,7 +5428,7 @@ Médio</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5109,7 +5442,7 @@ Médio</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>subida</translation> @@ -5156,7 +5489,7 @@ Médio</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5312,42 +5645,42 @@ Médio</translation> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Evento: aguardando ação do usuário</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Erro no registo do rótulo do evento.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do rótulo de cancelamento.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Erro ao importar os dados do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto da libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5367,222 +5700,254 @@ Médio</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>A consulta "get_events" falhou. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Pesquisa no banco de dados falhou no get_tags -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Conexão à base de dados falhou '%s' -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Consulta da base de dados falhou '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Pesquisa no banco de dados falhou no get_cylinders -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. </source> - <translation>Pesquisa no banco de dados falhou no get_changes + <translation>Conexão à base de dados falhou '%s' </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Pesquisa no banco de dados falhou no get_profile_sample + <translation>Consulta da base de dados falhou '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Falha na abertura da folha de estilo %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Não é possivel achar gas o %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Misturas de gás em excesso</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>Baseado em GF baixo = %d e GF alto = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Plano de mergulho do subsurface</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>profundidade</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>tempo</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>duração</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>gás</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Trocar o gás por %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Consumo de gás</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Aviso:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <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="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Sem reserva para compartilhar ar na subida</translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante a subida planejada) de %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5591,70 +5956,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5663,7 +6028,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5672,160 +6037,166 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Parada de segurança: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Parada de segurança: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>Em deco </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>Em deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Teto calculado %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tecido %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>Cardio: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 mergulhos)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 mergulho)</translation> </message> @@ -5990,97 +6361,97 @@ EADD: %d%s <translation>(nenhum mergulho)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Dom</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Seg</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Ter</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Qua</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Qui</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Sex</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Sáb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Fev</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Out</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Dez</translation> </message> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index 058c78aa0..e38af735d 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Companheiro:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>Busca por companheiros e guias de mergulho</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Não foi possível gravar a cópia de segurança %1. Mensagem de erro: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Não foi possível abrir a cópia de segurança: %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation>Detalhes do computador de mergulho lidos com sucesso</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Parâmetro gravado com sucesso no dispositivo</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Firmware do dispositivo actualizado com sucesso</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Configurações do dispositivo reconfiguradas com sucesso</translation> </message> @@ -847,72 +847,72 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Cópias de segurança (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>Ocorreu um erro ao efectuar a cópia de segurança. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Cópia de segurança efectuada com sucesso</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>As suas configurações foram gravadas em: %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation>Cópia de segurança das configurações do computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation>Erro na cópia de segurança XML</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation>Restaurar configurações do computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation>Erro ao restaurar XML</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ocorreu um erro ao restaurar a cópia de segurança. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>Reposição efectuada com sucesso</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>As suas definições foram restauradas com sucesso.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Seleccionar ficheiro de firmware</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>Todos os ficheiros (*.*)</translation> </message> @@ -1071,22 +1071,22 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>ID do dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Alcunha</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Ao clicar aqui irá remover este computador de mergulho.</translation> </message> @@ -1094,18 +1094,18 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Troca de emergência para CA</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>iniciar</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>fim</translation> @@ -1114,97 +1114,97 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Profundidade(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>pé</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Temperatura(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>libra</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Fato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Garrafa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>CNS Máx</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Local</translation> </message> @@ -1212,87 +1212,87 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Colapsar todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Colapsar outros</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Remover mergulho(s) desta viagem</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Criar uma nova viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Adicionar mergulho(s) à viagem imediatamente acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Adicionar mergulho(s) à viagem imediatamente abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Juntar esta viagem com a viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Juntar esta viagem com a viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Eliminar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Marcar mergulho(s) como inválido(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Juntar os mergulhos seleccionados</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Renumerar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Alterar tempos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Carregar imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Abrir ficheiros de imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1300,54 +1300,49 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Exportar formato</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>XML do Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Mapa mundo</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Selecção</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Mergulhos seleccionados</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Todos os mergulhos</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1362,107 +1357,133 @@ remover o computador de mergulho seleccionado?</translation> <translation>Definições</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation>DiveShare</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation>Profundidades das imagens</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Definições Gerais</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Números do Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation>Exportar estatísticas anuais</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Exportar apenas a lista</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Opções de estilo</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Fonte</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Tamanho da fonte</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Leve</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Areia</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Ficheiros UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>Ficheiros CSV (*.csv *.CSV)</translation> </message> @@ -1473,77 +1494,83 @@ remover o computador de mergulho seleccionado?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Valores separados por vírgulas que incluem a informação mais relevante do perfil de mergulho.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Enviar dados de mergulho para o sítio da web do divelogs.de.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation>Enviar dados do mergulho para dive-share.appspot.com</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Exportar HTML dos locais de mergulho, visualizados num mapa mundo.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Formato XML nativo do Subsurface.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation>Escrever as profundidades das imagens para um ficheiro</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Exportar ficheiro UDDF como</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Exportar ficheiro CSV como</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Exportar mapa mundo</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>Ficheiros HTML (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Exportar XML do Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>Ficheiros XML (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation>Gravar profundidades das imagens</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Exportar ficheiros HTML como</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Não é possível abrir o ficheiro %s</translation> </message> @@ -1582,7 +1609,7 @@ remover o computador de mergulho seleccionado?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Tempo</translation> </message> @@ -1608,25 +1635,25 @@ remover o computador de mergulho seleccionado?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Separador de campos</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Unidades</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Métrico</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperial</translation> </message> @@ -1641,100 +1668,160 @@ remover o computador de mergulho seleccionado?</translation> <translation>Mergulhos inseridos manualmente</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation>Escolha a ordem de dia, mês e ano para formatar a data. O separador pode ser qualquer um dos seguintes caracteres .-/.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Formato para a data</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>dd.mm.aaaa</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation>mm/dd/aaaa</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation>aaaa-mm-dd</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Mergulho #</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation>Data nos formatos dd.mm.aaaa, aaaa-mm-dd ou mm/dd/aaaa</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation>Duração do mergulho em segundos ou no formato min:seg</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Etiquetas</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Prof. Max.</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Configuração de campos</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Profundidade média</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Companheiros</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Notas</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Peso</translation> </message> @@ -1846,77 +1933,92 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Tempo</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Pressão</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Côr</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Pressão S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation>Pressão ambiente</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Pressão I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Inserido pelo utilizador</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Lista de garrafas</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Tecto</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>Consumo</translation> </message> @@ -1967,127 +2069,127 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>Consumo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>pés</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Fato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Garrafa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>CNS Máx</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Profundidade(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Temperatura(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>libras</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2191,54 +2293,54 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Tentar novamente</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Procurar computador de mergulho Uemis</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Seleccione o ficheiro para descarregar os mergulhos do computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Ficheiros log (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Gravar a descarga do libdivecomputer não descarrega os mergulhos para a lista</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Seleccione o ficheiro para gravar a descarga binária do libdivecomputer</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Ficheiros dump (*.bin)</translation> </message> @@ -2311,17 +2413,42 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation>Chave</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Valor</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2360,17 +2487,17 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation>A actualização do firmware falhou!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>Não foi possível estabelecer a ligação com o computador de mergulho</translation> </message> @@ -2378,7 +2505,7 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Editar locais seleccionados</translation> </message> @@ -2386,7 +2513,7 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Local:</translation> </message> @@ -2402,330 +2529,330 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Coordenadas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Guia de mergulho</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Companheiros</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Etiquetas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Visibilidade</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Fato</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Notas do mergulho</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Temp. do ar</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Temp. da água</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Notas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Equipamento</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Gases usados</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Gás consumido</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Prof. Max.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Pressão</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Duração do mergulho</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Tempo total</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Consumo de gás</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation>Dados extra</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation>Dados adicionais do computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Tempo</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Informações sobre o mergulho</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Intervalo de superfície</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>Consumo</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Prof. média</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Salinidade</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Estatísticas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Mergulhos</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Fotos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Garrafas</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Lastro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation>Aplicar alterações</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation>Descartar alterações</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Adicionar garrafa</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation>Adicionar sistema de lastro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Temp. do ar [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Temp. da água [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Esta viagem está a ser editada.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Estão a ser editados vários mergulhos.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Este mergulho está a ser editado.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Notas sobre a viagem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Local da viagem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Mergulho mais fundo</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Mergulho menos fundo</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation>Consumo mais elevado num mergulho</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation>Consumo mais baixo num mergulho</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation>Média do consumo para os mergulhos seleccionados</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation>Temperatura mais elevada</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation>Temperatura mais baixa</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation>Média da temperatura nos mergulhos seleccionados</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation>Mergulho mais longo</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation>Mergulho mais curto</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation>Duração média para os mergulhos seleccionados</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2734,17 +2861,17 @@ obtidos a partir do ar usando: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>e</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Eliminar as alterações?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Está prestes a eliminar as alterações.</translation> </message> @@ -2752,92 +2879,92 @@ obtidos a partir do ar usando: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&Ficheiro</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation>Exportar logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Mostrar/ocultar gráfico de pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Mostrar/ocultar cálculo para todos os tecidos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Mostrar/ocultar o tecto indicado pelo computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Mostrar/ocultar o tecto calculado</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Mostrar/ocultar NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Mostrar/ocultar tecto calculado com intervalos de 3 m</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Configurar &computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Planear novamente o &mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Mostrar/ocultar ritmo cardíaco</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>Mostrar/ocultar MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Mostrar/ocultar EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>Mostrar/ocultar taxa de consumo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Mostrar/ocultar régua</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Detalhes do plano de mergulho</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Imprimir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2850,486 +2977,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Ver</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Ajuda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Importar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Novo logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Novo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Abrir logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Gravar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Gravar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>G&ravar como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Guardar como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>&Fechar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Encerrar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>P&referências</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importar dados de &GPS a partir do serviço Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>&Copiar detalhes do mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>Colar detalhes do mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>&Perfil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>&Informações</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>&Todas</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>&Próximo computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>&Acerca do Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>&Globo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Importar &de Divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>&Ecrã completo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Ligar/desligar ecrã completo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>&Procurar actualizações</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>&Exportar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation>Mostrar/ocultar gráfico da pO₂ </translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation>Mostrar/ocultar gráfico da pN₂ </translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Escalar gráfico</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation>Mostrar/ocultar imagens</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation>Mostrar/ocultar garrafas</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>&Filtrar lista mergulhos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation>Mostrar/ocultar gráfico dos tecidos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Imprimir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&Fechar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Importar do &computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>&Editar nomes dos computadores de mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>&Adicionar mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Agrupar &automaticamente</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>&Estatísticas anuais</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>&Lista de mergulhos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Computador de mergulho &anterior</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Esquerda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Direita</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>&Manual do utilizador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>P&lanear mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>&Importar ficheiros de registo de mergulhos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Importar logbooks de outros programas</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Abrir Ficheiro</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Imprimir tabela de runtime</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Guardar alterações?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Guardar ficheiro como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Abrir ficheiro de registo de mergulhos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation>Ficheiros de logbooks (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Ficheiros Cochran (*.can);;Ficheiros CSV (*.csv);;Ficheiros DiveLog.de (*.dld);;JDiveLog files (*.jlb);;Ficheiros Liquivision (*.lvd);;Ficheiros MkVI (*.txt);;Ficheiros Suunto (*.sde *.db);;Ficheiros UDDF/UDCF (*.uddf *.udcf);;Ficheiros XML (*.xml);;Todos os ficheiros (*)</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Estatísticas anuais</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3337,12 +3469,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>O filtro mostra %1 (de %2) mergulhos</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3400,387 +3572,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Definições padrão</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Unidades</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Gráfico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Língua</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Rede</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Fonte</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Tamanho da fonte</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Mergulhos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Use o padrão</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animações</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Velocidade</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Limpar todas as definições</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Restaurar todas as definições para o seu valor padrão</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Métrico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personalizar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>metro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>pés</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>litro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>pés cúbicos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Linguagem do sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Tipo de proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Servidor</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Porta</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Requer autenticação</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Nome de utilizador</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Palavra-passe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filtros</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Pressão</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Listas e tabelas</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Ficheiro de mergulho</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Mostrar inválidos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Garrafa padrão</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Usar a garrafa padrão</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Serviço web do Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>ID do utilizador</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Gravar o ID do utilizador localmente?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>libra</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Unidades de tempo</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minutos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Segundos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Mostrar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFlow à profundidade máxima</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Diversos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Preferências</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Denominador para a velocidades de subida/descida</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Limite quando mostrar pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Limite quando mostrar pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Limite quando mostrar pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>pO₂ Max quando mostrar MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Desenhar a vermelho o tecto calculado pelo computador de mergulho </translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Mostrar garrafas não usadas na tab do equipamento</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Mostrar profundidade média</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Sem proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Proxy do sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>Proxy HTTP</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>É necessário reiniciar a aplicação</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Para alterar a linguagem é necessário reiniciar o Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Se clicar OK, todas as definições do Subsurface serão reinicializadas para os seus valores padrão. Isto será aplicado imediatamente.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Abrir ficheiro de registo de mergulhos padrão</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Aviso</translation> </message> @@ -3907,72 +4094,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Mergulho #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Prof. Máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Duração: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Gás usado:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Etiquetas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>Consumo:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Lastro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Guia:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Companheiros:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Fato:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Visibilidade:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Classificação:</translation> </message> @@ -3980,103 +4167,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation>(#%1 of %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>A visualização do NDL /TTS foi desactivada devido ao excessivo tempo de processamento</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Tornar como primeiro computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Eliminar este computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Adicionar mudança de gás</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation>(Garrafa %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation>Adicionar alteração do set-point</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Adicionar marcador</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Remover evento</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Esconder eventos semelhantes</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Editar nome</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <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="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Mostrar todos os eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Ocultar todos os %1 eventos?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Remover o evento seleccionado?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Editar nome do marcador</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Nome personalizado:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>O nome é demasiado comprido!</translation> </message> @@ -4104,22 +4291,22 @@ p, li { white-space: pre-wrap; } <translation>Encerrar</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Média</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Mínima</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Máxima</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Mova o mapa e dê um duplo clique para definir o local de mergulho</translation> </message> @@ -4187,12 +4374,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>Não foi possível estabelecer uma ligação ao computador de mergulho.</translation> </message> @@ -4206,12 +4393,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Novo número inicial</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Novo número</translation> </message> @@ -4219,12 +4406,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>Não foi possível estabelecer uma ligação ao computador de mergulho.</translation> </message> @@ -4303,12 +4490,12 @@ p, li { white-space: pre-wrap; } <translation>Que data e hora estão representados na imagem?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Abrir imagem</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4358,6 +4545,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4381,8 +4682,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Aplicação multi-plataforma para registo de mergulhos<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, e outros, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4436,7 +4737,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Fatos:</translation> </message> @@ -4452,11 +4753,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Adicionar garrafa</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4466,7 +4762,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Etiquetas:</translation> </message> @@ -4516,54 +4812,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Procurar actualizações</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Não foi possível encontrar actualizações para o Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Ocorreu o seguinte erro :</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Por favor, verifique a ligação à Internet</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation>Está a usar a última versão do Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Está disponível uma nova versão do Subsurface.<br/>Clique em:<br/><a href="%1">%1</a><br/> para a descarregar.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation>Está disponível uma nova versão do Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation>A última versão é %1. Por favor verifique com o vendedor do sistema operativo a existência de actualizações.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation>A última versão lançada foi </translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Ocorreu um erro na tentativa de procura de actualizações.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4583,64 +4899,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Gostaríamos de conhecer os nossos utilizadores, as suas preferências e os seus hábitos de utilização. Por favor, despenda um minuto a preencher este formulário e a submetê-lo à equipa do Subsurface. Por favor, seleccione todas as opções que se aplicam ao seu perfil.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Questionário ao utilizador</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Inquérito aos utilizadores do Subsurface</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Mergulhador desportivo</translation> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Mergulhador técnico</translation> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Interesse no planeamento de mergulhos</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Descarrego mergulhos de um computador de mergulho suportado</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Importo mergulhos a partir de outro programa / outra fonte</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Introduzo manualmente os mergulhos</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Uso o Android companion app para gerir os locais de mergulho</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Por favor insira as suas sugestões (em inglês) na caixa seguinte</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Será igualmente submetida a seguinte informação sobre o seu sistema</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4813,12 +5139,19 @@ Arquitectura do CPU e SO: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>Não foi possível estabelecer uma ligação ao computador de mergulho.</translation> </message> @@ -4826,79 +5159,79 @@ Arquitectura do CPU e SO: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Ano >Mês / Viagem</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Duração Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Mais curto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Mais longo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Profundidade (%1) Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Mínimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>Consumo (%1) Médio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temperatura (%1) @@ -4914,13 +5247,13 @@ Média</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4931,16 +5264,16 @@ Média</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>pés</translation> </message> @@ -4966,120 +5299,120 @@ Média</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>libras</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>ar</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integrado</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>cinto</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>tornozelo</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>lastro no arnês</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Falha na leitura de '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>Não foi possível abrir o ficheiro CSV %s; por favor usar a opção Importar log no menu Ficheiro</translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Falha ao importar Poseidon: não foi possíve ler '%s'</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation>Posição do bocal CA</translation> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation>Posição do bocal CF</translation> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation>Posição do bocal desconhecida</translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation>Posição do bocal não ligada</translation> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation>Desligado</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation>A calibração de O₂ falhou</translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation>Calibração de O₂ </translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation>Não foi possível encontrar um computador de mergulho correspondente ao ficheiro '%s'</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>O número máximo de colunas suportadas ao importar ficheiros CSV é %d</translation> </message> @@ -5098,7 +5431,7 @@ Média</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation>bateria</translation> </message> @@ -5112,7 +5445,7 @@ Média</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>subida</translation> @@ -5159,7 +5492,7 @@ Média</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5315,42 +5648,42 @@ Média</translation> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Evento: à espera de acção do utilizador</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Erro no registo do "event handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do "cancellation handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Erro a importar os dados do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto do libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Não possui previlégios suficientes para abrir o dispositivo %s %s (%s)</translation> </message> @@ -5370,223 +5703,255 @@ Média</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>A consulta "obter eventos" falhou. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Falha no query get_tags à base de dados. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Falha na ligação à base de dados '%s' -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>A consulta da base de dados falhou '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Falha na obtenção do query get_cylinders da base de dados. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. </source> - <translation>Falha na obtenção do query get_changes na base de dados. + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Falha na ligação à base de dados '%s' </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Falha na obtenção do query get_profile_sample da base de dados. + <translation>A consulta da base de dados falhou '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Não é possível abrir a folha de estilos %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Não foi possível encontrar o gás %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Demasiadas misturas de gás</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>O cálculo da descompressão foi terminado por esta ser demasiado longa</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>Baseado num GFlow = %d e GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Plano de mergulho Subsurface</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>profundidade</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>duração</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>gás</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Transição para %.*f %s em %d:%02d min - runtime %d:%02u a %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transição para %.*f %s em %d:%02d min - runtime %d:%02u com %s</translation> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Permanecer a at %.*f %s durante %d:%02d min - runtime %d:%02u a %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Permanecer a %.*f %s for %d:%02d min - runtime %d:%02u com %s</translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Trocar gás para %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Mudar para %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consumo de gás (excluídas as fases c/CCR):</translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Consumo de gás:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Aviso:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>Aviso: o planeamento de mergulhos através desta ferramenta baseia-se no algoritmo de Buehlmann. No entanto, esta implementação é recente e foi alvo de testes limitados. Recomenda-se aos utilizadores que não se baseiem apenas nesta ferramenta para planear os seus mergulhos.</translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation>a quantidade de gás necessária excede a quantidade disponível na garrafa!</translation> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>a reserva de gás não é suficiente para ser partilhada durante a subida!</translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s na subida planeada)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante a subida planeada) de %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valor pO₂ elevado %.2f em %d:%02u com gás %s à profundidade de %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5595,70 +5960,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5668,7 +6033,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5678,49 +6043,49 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Paragem de segurança: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Paragem de segurança: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Descompressão: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Descompressão: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>Em descompressão </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin @@ -5728,113 +6093,119 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Descompressão: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>Em descompressão (calc) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Tecto calculado %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tecido %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>frequência cardíaca: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>enfiamento: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 mergulhos)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 mergulho)</translation> </message> @@ -5999,97 +6370,97 @@ EADD: %d%s <translation>(nenhum mergulho)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Dom</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Seg</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Ter</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Qua</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Qui</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Sex</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Sáb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Fev</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Out</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Dez</translation> </message> diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts index d5f3df899..68e04ac1e 100644 --- a/translations/subsurface_ro_RO.ts +++ b/translations/subsurface_ro_RO.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1069,22 +1069,22 @@ computerul de scufundări selectat?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>ID-ul dispozitivului</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Alias</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"/> </message> @@ -1092,18 +1092,18 @@ computerul de scufundări selectat?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>început</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>sfârșit</translation> @@ -1112,97 +1112,97 @@ computerul de scufundări selectat?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Dată</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Costum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Locație</translation> </message> @@ -1210,87 +1210,87 @@ computerul de scufundări selectat?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1298,54 +1298,49 @@ computerul de scufundări selectat?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation type="unfinished"/> </message> @@ -1360,107 +1355,133 @@ computerul de scufundări selectat?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Mărimea fontului</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Fișiere UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation type="unfinished"/> </message> @@ -1471,77 +1492,83 @@ computerul de scufundări selectat?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> + <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> - <source>Send the dive data to divelogs.de website.</source> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> - <source>Send the dive data to dive-share.appspot.com website</source> + <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> - <source>HTML export of the dive locations, visualized on a world map.</source> + <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> - <source>Subsurface native XML format.</source> + <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <source>Subsurface native XML format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> @@ -1580,7 +1607,7 @@ computerul de scufundări selectat?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Timp</translation> </message> @@ -1606,25 +1633,25 @@ computerul de scufundări selectat?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Unități</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metric</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperial</translation> </message> @@ -1639,100 +1666,160 @@ computerul de scufundări selectat?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Dată</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Etichete</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Locație</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Companion</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Notițe</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Greutate</translation> </message> @@ -1844,77 +1931,92 @@ computerul de scufundări selectat?</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Adâncime</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Timp</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Presiune</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatură</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1965,127 +2067,127 @@ computerul de scufundări selectat?</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Dată</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Adâncime</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Greutate</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Costum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Locație</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2189,54 +2291,54 @@ computerul de scufundări selectat?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Eroare</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Reîncearcă</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Fișiere de log (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Avertizare</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Selectați fișierul pentru a salva dump-ul binar al computerului de scufundări</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Fișiere dump (*.bin)</translation> </message> @@ -2309,17 +2411,42 @@ computerul de scufundări selectat?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2358,17 +2485,17 @@ computerul de scufundări selectat?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2376,7 +2503,7 @@ computerul de scufundări selectat?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation type="unfinished"/> </message> @@ -2384,7 +2511,7 @@ computerul de scufundări selectat?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2400,347 +2527,347 @@ computerul de scufundări selectat?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Locație</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Coordonate</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Maestru scufundare</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Companion</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Etichete</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Vizibilitate</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Costum</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Notițe</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Echipament</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Dată</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Timp</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Interval</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Salinitate</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Statistici</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Adâncime</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatură</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Scufundări</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Tub</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Greutăți</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Această scufundare este editată</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2748,92 +2875,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&Fișier</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Printează</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2842,486 +2969,491 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Ajutor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Importați</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Jurnal nou</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Nou</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Deschide jurnal</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Deschide</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Salvează</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Salvează</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Salvează ca</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>&Închide</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Închide</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Printează</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Importă din computerul de &scufundări</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctr++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Renumerotează</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Stânga</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Dreapta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Anulează</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Avertizare</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3329,12 +3461,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3392,387 +3564,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Implicite</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Unități</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Grafic</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Limba</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Mărimea fontului</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Scufundări</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Sistem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metric</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personalizați</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Adâncime</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>metru</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>picioare</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>livre pe inch pătrat</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>litru</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>picioare cubice</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>Celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>Fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Parola</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filtrează</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Presiune</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volum</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatură</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Greutate</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Unități de timp</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minute</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Secunde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Arată</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow la adâncimea maximă</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Diverse</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Preferințe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Este necesară o repornire</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Pentru a încărca corect o nouă limbă trebuie să restartați Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Avertizare</translation> </message> @@ -3899,72 +4086,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>necunoscut</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Scufundarea #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Adâncimea maximă: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Durata: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>GreutățiȘ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Notițe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Maestru scufundare:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Companion:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Costum:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Rating:</translation> </message> @@ -3972,103 +4159,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Șterge evenimente similare</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Arată toate evenimentele</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Ascunde evenimente</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Ascunde toate %1 evenimentele?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Înlătură evenimentul selectat?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4096,22 +4283,22 @@ p, li { white-space: pre-wrap; } <translation>Închide</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Medie</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Minim</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Maxim</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Mutați harta si faceți dublu click pentru a seta locația scufundării</translation> </message> @@ -4179,12 +4366,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4198,12 +4385,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Nou număr de început</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4211,12 +4398,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4295,12 +4482,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -4350,6 +4537,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4373,7 +4674,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> <translation type="unfinished"/> </message> </context> @@ -4428,7 +4729,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -4444,11 +4745,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4458,7 +4754,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4508,53 +4804,73 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> <translation type="unfinished"/> </message> </context> @@ -4575,63 +4891,73 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> + <location filename="../qt-ui/usersurvey.ui" line="14"/> + <source>User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="14"/> - <source>User Survey</source> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> <message> @@ -4801,12 +5127,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4814,79 +5147,79 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>An > Luna / Excursie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Durată Totală</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Medie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Cel mai scurt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Cel mai lung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Adâncime (%1) Medie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Minim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Maxim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Mediu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4902,13 +5235,13 @@ Medie</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>livre pe inch pătrat</translation> </message> @@ -4919,16 +5252,16 @@ Medie</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>picioare</translation> </message> @@ -4954,120 +5287,120 @@ Medie</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>livre</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) sau (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>aer</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integrat</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>curea</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>gleznă</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>greutate placă spate</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Nu s-a putut citi '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Numărul maxim de coloane suportate la importarea CSV-ului este %d</translation> </message> @@ -5086,7 +5419,7 @@ Medie</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5100,7 +5433,7 @@ Medie</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>ascensiune</translation> @@ -5147,7 +5480,7 @@ Medie</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5303,42 +5636,42 @@ Medie</translation> <translation>Eroare parsând eșantioanele</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Eveniment: aștept acțiunea utilizatorului</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Eroare la înregistrarea handlerului de evenimente.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Eroare la înregistrarea handlerului de anulare.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Eroare la importarea datelor despre scufundare</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Nu s-a putut crea contextul libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Nu s-a putut deschide %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5357,433 +5690,475 @@ Medie</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Query-ul get_events nu a reușit. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Conectarea la baza de date a eșuat „%s”. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Query-ul bazei de date a eșuat „%s”. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Conectarea la baza de date a eșuat „%s”. +</translation> + </message> + <message> + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. +</source> + <translation>Query-ul bazei de date a eșuat „%s”. +</translation> + </message> + <message> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Nu s-a putut deschide stylesheet-ul %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Prea multe amestecuri de gaz</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 scufundări)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 scufundare)</translation> </message> @@ -5948,97 +6323,97 @@ EADD: %d%s <translation>(nicio scufundare)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Duminică</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Luni</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Marți</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Miercuri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Joi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Vineri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Sâmbătă</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Iun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Iul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Noi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 2181b128c..d24bac80f 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Люди:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1069,22 +1069,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Модель</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Идентификатор</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Название</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Нажмите здесь чтобы удалить этот дайвкомпьютер.</translation> </message> @@ -1092,18 +1092,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Переход на Откр. Цикл</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation> начало</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation> конец</translation> @@ -1112,97 +1112,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Глубина(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Температура(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Вес(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Баллон</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -1210,87 +1210,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Развернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Свернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Свернуть остальные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Удалить из поездки</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Создать поездку выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Добавить к поездке сверху</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Добавить к поездке снизу</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Объединить с поездкой выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Объединить с поездкой ниже</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Удалить</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Пометить как ошибочное(-ые)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Объединить выбранные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Сдвиг времени</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Загрузить фото</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Открыть файлы изображений</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1298,54 +1298,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Формат экспорта</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Карта мира</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Выбор</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Выделенные погружения</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Все погружения</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1360,107 +1355,133 @@ <translation>Обычный</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Общие настройки</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Нумерация Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Только список</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Настройки стиля</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Шрифт</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Размер шрифта</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Тема</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Светлая</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Песочная</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF файлы (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV файлы (*.csv *.CSV)</translation> </message> @@ -1471,77 +1492,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Значения, разделенные запятой. Включает наиболее важную информацию о профиле погружения.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Отправить данные погружения на сайт divelogs.de.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML экспорт мест погружений на карте мира.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Собственный XML-формат Subsurface.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Файл для UDDF экспорта</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Файл для CSV экспорта</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Файл для экспорта карты</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML файлы (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Экспорт Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML файлы (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Экспортировать HTML файл как</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Невозможно открыть файл %s</translation> </message> @@ -1580,7 +1607,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Время</translation> </message> @@ -1606,25 +1633,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Разделитель</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Единицы</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Метрическая</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Имперская</translation> </message> @@ -1639,100 +1666,160 @@ <translation>Погружения введённые вручную</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Формат даты</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>dd.mm.yyyy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Макс. глубина</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Порядок полей</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Сред. глубина</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Партнер</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Примечания</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Вес</translation> </message> @@ -1844,77 +1931,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Давление</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Цвет</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Давление S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Давление I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Пользователь</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Индекс баллона</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Потолок</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1965,127 +2067,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Темп.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Вес(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Баллон</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Глубина(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Температура(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2189,54 +2291,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Повторить</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Найти дайвкомпьютер Uemis</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Выберите файл для журнала загрузки из дайв-компьютера</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Файлы журналов (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>При сохранении дампа, погружения в журнал НЕ загружаются.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Дамп-файлы (*.bin)</translation> </message> @@ -2309,17 +2411,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2358,17 +2485,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2376,7 +2503,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Редактировать местоположение выбранных погружений</translation> </message> @@ -2384,7 +2511,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Места:</translation> </message> @@ -2400,330 +2527,330 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Координаты</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Инструктор</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Партнер</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Видимость</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Погружение</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Темп. воздуха</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Темп. воды</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Примечания</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Снаряжение</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Исп. газы</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Расход газа</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Макс. глубина</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Давл. воздуха</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Время погружения</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Общее время</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Расход газа</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Информация</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Интервал</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Сред. глубина</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Соленость</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Статистика</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Глуб.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Погружения</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Фотографии</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Баллоны</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Грузы</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Добавить баллон</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Темп. воздуха [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Темп. воды [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Редактирование поездки.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Множественное редактирование.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Редактирование погружения.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Поездка</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Местоположение</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Максимум</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Минимум</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2732,17 +2859,17 @@ mixed from Air and using: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation> и </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Отменить изменения?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Вы собираетесь отменить свои изменения.</translation> </message> @@ -2750,92 +2877,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>Файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>График pHe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Расчет всех тканей</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Потолок компьютера</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Расчетный потолок</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>3м шаг для расчетного потолка</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Настройки дайв-компьютера</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Перепланировать</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Рулетка</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Детальный план погружения</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Печать</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2848,486 +2975,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>Журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>Вид</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>Импорт</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>Новый журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Новый</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>Настройки</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Импорт координат из веб-сервиса Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>Копировать параметры дайва</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>Вставить параметры дайва</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>Профиль</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>Информация</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>Все</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>След. компьютер</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>О Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>Карта</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Импорт с сайта divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>Полный экран</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Переключить полноэкранный режим</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>Проверить обновления</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>Экспорт</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation>График pO₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation>График pN₂</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Альтернативный масштаб</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>Фильтр погружений</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>Печать</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Импорт из дайвкомпьютера</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>Мои дайв-компьютеры</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>Добавить погружение</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Авто-группировка</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Пред. компьютер</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Влево</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Вправо</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>Руководство пользователя</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>Планировщик</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>Импорт журналов</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Импортировать журнал погружений из другой программы</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Сохраните или отмените изменения перед закрытием файла.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Сохраните или отмените изменения перед добавлением погружения.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл журнала?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Сохраните или отмените изменения перед открытием нового файла.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> @@ -3335,12 +3467,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>Показано %1 (из %2) погружений</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3398,387 +3570,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Общие</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Единицы</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Профиль</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Язык</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Сеть</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Шрифт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Размер шрифта</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Погружения</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>По умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Анимация</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Скорость</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Очистить все натройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Сбросить все настройки в значение по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Система мер</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Метрическая</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Имперская</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Настроить</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>метр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>литр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>куб. фут</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>цельсий</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>фаренгейт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Системные настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Тип прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Хост</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Порт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Требуется авторизация</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Пользователь</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Пароль</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Фильтр</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Давление</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Списки и таблицы</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Журнал по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Показывать ошибочные</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Баллон по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Использовать по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Веб-сервис Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>ID пользователя</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Сохранять ID пользователя</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Объем</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Единицы времени</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Минуты</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Секунды</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Показывать</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow на макс. грубине</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Разное</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Делитель скорости спуска/подъема</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Предельное значение pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Предельное значение pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Предельное значение pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Макс. pO₂ при отображении MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Показывать потолок дайвкомпьютера красным</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Показывать неиспользуемые баллоны</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Показывать среднюю глубину</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Без прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Системный прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Необходим перезапуск</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Для смены языка необходимо перезапустить Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Если вы нажмете ОК, все настройки Subsurface будут моментально сброшены в значение по умолчанию.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Выберите журнал по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -3905,72 +4092,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Погружение №%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Макс. глубина: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Длительность: %1 мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Исп. газы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Метки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Грузы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Заметки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Видимость:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> @@ -3978,103 +4165,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Сделать первым компьютером</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Удалить этот дайвкомпьютер</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -4102,22 +4289,22 @@ p, li { white-space: pre-wrap; } <translation>Закрыть</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Среднее</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Минимум</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Максимум</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Выберите место на карте двойным щелчком мыши.</translation> </message> @@ -4185,12 +4372,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4204,12 +4391,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Начать нумерацию с</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Новый номер</translation> </message> @@ -4217,12 +4404,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4301,12 +4488,12 @@ p, li { white-space: pre-wrap; } <translation>Какое время и дата отображены на изображении?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Открыть файл с изображением</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4356,6 +4543,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4379,8 +4680,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Мультиплатформенный журнал погружений<br><span style='font-size: 8pt'>Линус Торвальдс, Дирк Хондел, Томас Канабрава и другие, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4434,7 +4735,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Костюмы:</translation> </message> @@ -4450,11 +4751,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Добавить баллон</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4464,7 +4760,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Метки:</translation> </message> @@ -4514,54 +4810,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Проверить обновления.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Не получилось проверить наличие обновлений.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Возникла ошибка:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Проверьте Интернет-соединение.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Возникла ошибка во время проверки обновения.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4581,64 +4897,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Мы хотели бы побольше узнать о наших пользователях и их предпочтениях. Пожалуйста, потратьте минуту, чтобы заполнить эту форму и отправить ее команде Subsurface. Укажите все варианты, которые подходят вам.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Опрос пользователей</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Опрос пользователей Subsurface</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Рекреационный дайвер</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Технический дайвер</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Заинтересован в планировщике</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Я загружаю погружения из дайвкомпьютера</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Я загружаю погружения из других программ/источников</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Я ввожу погружения вручную</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Я использую приложения Android для привязки координат</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Оставьте ваши пожелания (на английском) в следующем поле</translation> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Также будет отправлена информация о вашем компьютере</translation> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4811,12 +5137,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4824,79 +5157,79 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Год > Месяц / Поездка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Длительность Общее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Кратчайшее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Самое долгое</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Глубина (%1) Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Минимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Максимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Темп. (%1) @@ -4912,13 +5245,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>бар</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4929,16 +5262,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>м</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>фут</translation> </message> @@ -4964,120 +5297,120 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>фунт</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) или (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>воздух</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>интегрированный</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>пояс</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>груз на ноги</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>груз на пластину</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>карабины</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Ошибка чтения '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Для импорта CSV максимально допустимое кол-во колонок %d</translation> </message> @@ -5096,7 +5429,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5110,7 +5443,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>подъем</translation> @@ -5157,7 +5490,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5313,42 +5646,42 @@ Maximum</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5367,222 +5700,254 @@ Maximum</source> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Ошибка запроса get_events в БД. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Запрос get_tags в базу не выполнился. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Ошибка соединения с БД '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Ошибка запроса к БД '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Запрос get_cylinders в базу не выполнился. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. </source> - <translation>Запрос get_changes в базу не выполнился. + <translation>Ошибка соединения с БД '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Запрос get_profile_sample в базу не выполнился. + <translation>Ошибка запроса к БД '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Слишком много смесей</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Расчет деко прекращен из-за большой длительности</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>на основе GFlow = %d и GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>План погружения Subsurface</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>глубина</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>отсчет</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>длительность</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>смесь</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Переключение на %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Расход газов:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Внимание:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation>расход выше чем запас газа в указанном баллоне!</translation> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>недостаточно газа для резерва при подъеме</translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s в запланированном подъеме)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s в запланированном подъеме) на %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5591,70 +5956,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>Д: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>Т: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>С: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5663,7 +6028,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5672,162 +6037,168 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Ост. безопасности: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Ост. безопасности: неизв. время @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Деко: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Деко: неиз. время @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>В деко </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Деко: %uмин @ %.0f%s (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>В деко (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Расчетный потолок %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Ткань %.0fмин: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>пульс: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>азимут: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sГ:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sГ:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sС:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sС:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sД:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 погружений)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 погружение)</translation> </message> @@ -5992,97 +6363,97 @@ EADD: %d%s <translation>(нет погружений)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Вск</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Пнд</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Втр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Срд</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Чтв</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Птн</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Суб</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Янв</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Мар</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Июн</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Июл</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Снт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Ноя</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Дек</translation> </message> diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index 71237cc77..892da5650 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -3,14 +3,14 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> - <translation type="unfinished"/> + <translation>Osoba:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> - <translation type="unfinished"/> + <translation>Vyhľadávanie partnerov a divemastrov</translation> </message> </context> <context> @@ -18,40 +18,40 @@ <message> <location filename="../qt-ui/filtermodels.cpp" line="233"/> <source>No buddies</source> - <translation type="unfinished"/> + <translation>Žiaden partner</translation> </message> </context> <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Neviem uložiť zálohu %1. Error Message: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Neviem otvoriť zálohu: </translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> - <translation type="unfinished"/> + <translation>Detaily o počítači úspešne načítané</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Nastavenie bolo úspešne uložené do zariadenia</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> - <translation type="unfinished"/> + <translation>Firmware počítača úspešne aktualizovaný</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> - <translation type="unfinished"/> + <translation>Základné nastavenie počítača úspešne obnovené</translation> </message> </context> <context> @@ -178,7 +178,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="334"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1930"/> <source>Gauge</source> - <translation type="unfinished"/> + <translation>Gauge</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="339"/> @@ -401,7 +401,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="587"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1733"/> <source>Show safety stop</source> - <translation type="unfinished"/> + <translation>Zobraziť bezpečnostnú zastávku</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="597"/> @@ -417,19 +417,19 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> <source>Suunto Vyper family</source> - <translation type="unfinished"/> + <translation>Suunto Vyper family</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced settings</source> - <translation type="unfinished"/> + <translation>Pokročilé nastavenia</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> - <translation type="unfinished"/> + <translation>Budúce TTS</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="625"/> @@ -452,29 +452,29 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="730"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1885"/> <source>Decotype</source> - <translation type="unfinished"/> + <translation>Decotype</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="756"/> <source> mbar</source> - <translation type="unfinished"/> + <translation> mbar</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="769"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1892"/> <source> min</source> - <translation type="unfinished"/> + <translation> min</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="783"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1925"/> <source>ZH-L16</source> - <translation type="unfinished"/> + <translation>ZH-L16</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="788"/> <source>ZH-L16+GF</source> - <translation type="unfinished"/> + <translation>ZH-L16+GF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="851"/> @@ -491,7 +491,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="865"/> <source>Flip screen</source> - <translation type="unfinished"/> + <translation>Obrátiť obrazovku</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="873"/> @@ -631,7 +631,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1153"/> <source>Sensor</source> - <translation type="unfinished"/> + <translation>Senzor</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1161"/> @@ -644,7 +644,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2323"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2339"/> <source> cbar</source> - <translation type="unfinished"/> + <translation> cbar</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> @@ -661,22 +661,22 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> <source>Total dive time</source> - <translation type="unfinished"/> + <translation>Celkový čas ponoru</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> <source>kg/ℓ</source> - <translation type="unfinished"/> + <translation>kg/ℓ</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> <source>Apnoea</source> - <translation type="unfinished"/> + <translation>Apnoea</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> <source>Safety level</source> - <translation type="unfinished"/> + <translation>Úroveň bezpečnosti</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="916"/> @@ -684,29 +684,29 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2122"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2207"/> <source>%O₂</source> - <translation type="unfinished"/> + <translation>%O₂</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1124"/> <source>O₂ in calibration gas</source> - <translation type="unfinished"/> + <translation>O₂ v kalibračnej zmesi</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>pO₂ max</source> - <translation type="unfinished"/> + <translation>pO₂ max</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>pO₂ min</source> - <translation type="unfinished"/> + <translation>pO₂ min</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1290"/> <source>Altitude range</source> - <translation type="unfinished"/> + <translation>Výškový rozsah</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1297"/> @@ -717,7 +717,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1317"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1759"/> <source>Number of dives</source> - <translation type="unfinished"/> + <translation>Počet ponorov</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1377"/> @@ -728,32 +728,32 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1424"/> <source>P0 (none)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P0 (žiadne)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> - <translation type="unfinished"/> + <translation>Vzorkovacia frekvencia</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1455"/> <source>20s</source> - <translation type="unfinished"/> + <translation>20s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1460"/> <source>30s</source> - <translation type="unfinished"/> + <translation>30s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1465"/> <source>60s</source> - <translation type="unfinished"/> + <translation>60s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> - <translation type="unfinished"/> + <translation>Model počítača</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1497"/> @@ -764,17 +764,17 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1511"/> <source>24h</source> - <translation type="unfinished"/> + <translation>24h</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1516"/> <source>12h</source> - <translation type="unfinished"/> + <translation>12h</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1524"/> <source>Time format</source> - <translation type="unfinished"/> + <translation>Formát času</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1539"/> @@ -789,7 +789,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1555"/> <source>s</source> - <translation type="unfinished"/> + <translation>s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1562"/> @@ -799,12 +799,12 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1579"/> <source>Depth alarm</source> - <translation type="unfinished"/> + <translation>Hĺbkový alarm</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1599"/> <source>Time alarm</source> - <translation type="unfinished"/> + <translation>Časový alarm</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1624"/> @@ -814,105 +814,105 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> - <translation type="unfinished"/> + <translation>MM/DD/YY</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1746"/> <source>DD/MM/YY</source> - <translation type="unfinished"/> + <translation>DD/MM/YY</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1751"/> <source>YY/MM/DD</source> - <translation type="unfinished"/> + <translation>YY/MM/DD</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1935"/> <source>ZH-L16 CC</source> - <translation type="unfinished"/> + <translation>ZH-L16 CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> - <translation type="unfinished"/> + <translation>L16-GF OC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1950"/> <source>L16-GF CC</source> - <translation type="unfinished"/> + <translation>L16-GF CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/> <source>PSCR-GF</source> - <translation type="unfinished"/> + <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Záložné súbory (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>Chyba počas ukladania zálohy. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Vytvorenie zálohy úspešné</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>Nastavenie bolo uložené do: %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> - <translation type="unfinished"/> + <translation>Nastavenie záložného počítača</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> - <translation type="unfinished"/> + <translation>Chyba XML zálohy</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> - <translation type="unfinished"/> + <translation>Obnova nastavenia počítača</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> - <translation type="unfinished"/> + <translation>Chyba XML obnovy</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Pri obnove zálohy nastala chyba. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>Úspešná obnova</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>Nastavenia boli obnovené úspešne.</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Vyber súbor s firmware</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>Všetky súbory (*.*)</translation> </message> @@ -952,7 +952,7 @@ <message> <location filename="../qt-ui/models.cpp" line="78"/> <source>O₂%</source> - <translation type="unfinished"/> + <translation>O₂%</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="79"/> @@ -962,7 +962,7 @@ <message> <location filename="../qt-ui/models.cpp" line="79"/> <source>Use</source> - <translation type="unfinished"/> + <translation>Použiť</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="191"/> @@ -1071,22 +1071,22 @@ vybraný počítač?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>ID zariadenia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Voliteľný názov</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Kliknutím sem vymažeš počítač.</translation> </message> @@ -1094,18 +1094,18 @@ vybraný počítač?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Záchrana na OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>začiatok</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>koniec</translation> @@ -1114,97 +1114,97 @@ vybraný počítač?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Hodnotenie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Hĺbka(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Tepl(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Záťaž(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Fľaša</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Zmes</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Miesto</translation> </message> @@ -1212,87 +1212,87 @@ vybraný počítač?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Expandovať všetky</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Zredukovať všetky</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Zbaliť ostatné</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Vymazať ponor(y) z akcie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Vytvoriť novú akciu nad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Pridať ponor(y) do akcie hneď nad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Pridať ponor(y) do akcie hneď pod</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Spoj akciu s akciou nad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Spoj akciu s akciou pod</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Zmazať ponor(y)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Neplatný ponor(y)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Spojiť vybraté ponory</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Prečíslovanie ponorov</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Posun času</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Nahrať obrázky</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Otvoriť súbory s obrázkami</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Grafické súbory (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1300,54 +1300,49 @@ vybraný počítač?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Export formát</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>sk.divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Mapa sveta</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Výber</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Vybrané ponory</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Všetky ponory</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1362,107 +1357,133 @@ vybraný počítač?</translation> <translation>Všeobecný export</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Obecné nastavenia</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Subsurface čísla</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> - <translation type="unfinished"/> + <translation>Export ročných štatistík</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Export zoznamu</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Nastavenia štýlov</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Veľkosť fontu</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Téma</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Svetlo</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Piesok</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF súbory (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV súbory (*.csv *.CSV)</translation> </message> @@ -1473,77 +1494,83 @@ vybraný počítač?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Čiarkou oddelené hodnoty obsahujúce najrelevantnejšie informácie o profile ponoru.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Odoslať dáta o ponore na stránku divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> - <translation type="unfinished"/> + <translation>Odoslať dáta o ponore na stránku dive-share.appspot.com</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML export potápačskej lokality zobrazenej na mape sveta.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Subsurface XML formát.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Exportovať UDDF súbor ako</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Exportovať CSV súbor ako</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Exportovať mapu sveta</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML súbory (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Exportovať </translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML súbory (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Exportovať HTML súbor ako</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Neviem otvoriť súbor</translation> </message> @@ -1582,7 +1609,7 @@ vybraný počítač?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Čas</translation> </message> @@ -1608,25 +1635,25 @@ vybraný počítač?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Oddeľovač položiek</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Jednotky</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metrický</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperiálny</translation> </message> @@ -1641,100 +1668,160 @@ vybraný počítač?</translation> <translation>Ručné ponory</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> - <translation type="unfinished"/> + <translation>Zvoľ postupnosť dňa, mesiaca a roku pre formát dátumu. Oddeľovník môže byť jeden z .-/.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Formát dátumu</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> - <translation type="unfinished"/> + <translation>dd.mm.rrrr</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> - <translation type="unfinished"/> + <translation>mm/dd/rrrr</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> - <translation type="unfinished"/> + <translation>rrrr-mm-dd</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Ponor #</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> - <translation type="unfinished"/> + <translation>Dátum v dd.mm.rrrr, rrrr-mm-dd alebo mm/dd/rrrr formáte</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> - <translation type="unfinished"/> + <translation>Trvanie ponoru v sekundovom alebo min:sec formáte</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> - <translation type="unfinished"/> + <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Značky</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Miesto</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Max. hlbka</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Configurácia položiek</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Stredná hlbka</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Poznámky</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Hmotnosť</translation> </message> @@ -1774,7 +1861,7 @@ vybraný počítač?</translation> <message> <location filename="../qt-ui/diveplanner.ui" line="220"/> <source> kg/ℓ</source> - <translation type="unfinished"/> + <translation> kg/ℓ</translation> </message> </context> <context> @@ -1840,83 +1927,98 @@ vybraný počítač?</translation> <message> <location filename="../qt-ui/diveplanner.cpp" line="304"/> <source>Save new</source> - <translation type="unfinished"/> + <translation>Uložiť nový</translation> </message> </context> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Hĺbka</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Čas</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Tlak</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Teplota</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Farba</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Tlak S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> + <translation>Okolitý tlak</translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Tlak I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Index fliaš</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Strop</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>Spotreba plynu</translation> </message> @@ -1926,7 +2028,7 @@ vybraný počítač?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="14"/> <source>Dialog</source> - <translation type="unfinished"/> + <translation>Dialog</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="34"/> @@ -1936,7 +2038,7 @@ vybraný počítač?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="48"/> <source>⌫</source> - <translation type="unfinished"/> + <translation>⌫</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> @@ -1961,133 +2063,133 @@ vybraný počítač?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="105"/> <source>Upload dive data</source> - <translation type="unfinished"/> + <translation>Nahraj data ponoru</translation> </message> </context> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Hodnotenie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Hĺbka</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Teplota</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Hmotnosť</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>Spotreba plynu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Záťaž(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Fľaša</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Zmes</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Miesto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Hĺbka(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Tepl(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2191,54 +2293,54 @@ vybraný počítač?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Skús znovu</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Hladať Uemis DC</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Zvoľ meno log súboru pre divecomputer sťahovanie</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Log súbory</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Upozornenie</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Uloženie dump súboru pre libdivecomputer spôsobí nenahratie ponorov do zoznamu ponorov.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Zvoľ meno súboru pre divecomputer dump</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Dump súbory</translation> </message> @@ -2311,17 +2413,42 @@ vybraný počítač?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> - <translation type="unfinished"/> + <translation>Kľúč</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Hodnota</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2336,7 +2463,7 @@ vybraný počítač?</translation> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> <source>Filter this list</source> - <translation type="unfinished"/> + <translation>Filtruj zoznam</translation> </message> </context> <context> @@ -2344,33 +2471,33 @@ vybraný počítač?</translation> <message> <location filename="../qt-ui/filterwidget.ui" line="73"/> <source>Reset filters</source> - <translation type="unfinished"/> + <translation>Zrušenie filtrov</translation> </message> <message> <location filename="../qt-ui/filterwidget.ui" line="87"/> <source>Show/hide filters</source> - <translation type="unfinished"/> + <translation>Zobraziť/skryť filtre</translation> </message> <message> <location filename="../qt-ui/filterwidget.ui" line="101"/> <source>Close and reset filters</source> - <translation type="unfinished"/> + <translation>Zatvoriť a zrušiť filtre</translation> </message> </context> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Daná funkcia pre zvolený počítač zatiaľ nie je k dispozícii.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> - <translation type="unfinished"/> + <translation>Obnova firmware zlyhala!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie je možné vytvoriť spojenie s počítačom.</translation> </message> @@ -2378,7 +2505,7 @@ vybraný počítač?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Edituj označené potápašské lokality</translation> </message> @@ -2386,9 +2513,9 @@ vybraný počítač?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> - <translation type="unfinished"/> + <translation>Miesto:</translation> </message> </context> <context> @@ -2402,330 +2529,330 @@ vybraný počítač?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Miesto</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Súradnice</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Značky</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Hodnotenie</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Viditeľnosť</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Poznámky</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Teplota vzduchu</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Teplota vody</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Poznámky</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Výstroj</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Použité zmesi</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Spotrebovaná zmes</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Max. hĺbka</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Tlak vzduchu</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Čas ponoru</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Celkový čas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Spotreba plynu</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Čas</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Informácie</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Povrch. interval</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>Spotreba plynu</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Priemerná hĺbka</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Slanosť</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Štatistiky</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Hĺbka</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Teplota</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Ponory</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Fotografie</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Fľaše</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Závažia</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> - <translation type="unfinished"/> + <translation>Vymazať zmeny</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Pridaj fľašu</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> - <translation type="unfinished"/> + <translation>Pridať závažia</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Teplota vzduchu [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Teplota vody [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Táto akcia je editovaná.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Viaceré ponory sú editované.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Tento ponor sa edituje.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Poznámky</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Lokalita</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Najhlbší ponor</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Najplytší ponor</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> - <translation type="unfinished"/> + <translation>Najvyššia teplota</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> - <translation type="unfinished"/> + <translation>Najnižšia teplota</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> - <translation type="unfinished"/> + <translation>Priemerná teplota všetkých zvolených ponorov</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> - <translation type="unfinished"/> + <translation>Najdlhší ponor</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> - <translation type="unfinished"/> + <translation>Najkratší ponor</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> - <translation type="unfinished"/> + <translation>Priemerná dĺžka všetkých vybraných ponorov</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2734,17 +2861,17 @@ vytvorene zo vzduchu a: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>a</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Vymazať zmeny?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Chystáš sa vymazať zmeny.</translation> </message> @@ -2752,92 +2879,92 @@ vytvorene zo vzduchu a: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&Súbor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> - <translation type="unfinished"/> + <translation>Exportovať všetko</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Prepnúť pHe graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Prepnúť výpočet všetkých tkanív</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Prepnúť zobrazenie stropu podľa počítača</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Prepnúť na vypočítaný strop</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>Prepnúť NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Prepnúť na </translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Konfigurácia počítača</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>&Opätovné plánovanie ponoru</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Prepnúť tepovú frekvenciu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>Prepnúť MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Prepnúť </translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>Prepnúť SAC spotrebu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Prepnúť pravítko</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Detailný plán ponoru</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Tlačiť</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2850,486 +2977,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Náhľad</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Nový logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Nový</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Otvoriť logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Otvor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Uložiť</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Uložiť</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Uložiť a&ko</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Uložiť ako</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>&Zatvoriť</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Zatvoriť</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>Na&stavenia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Import &GPS data zo Subsurface webu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>&Kopírovať údaje z ponoru</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>&Vložiť údaje z ponoru</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>&Všetko</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>&Nasledujúci DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>&O Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>&Zemeguľa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Import z &</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>&Celá obrazovka</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Prepnúť celú obrazovku</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>&Kontrola novšej verzie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>&Export</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> - <translation type="unfinished"/> + <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> - <translation type="unfinished"/> + <translation>Prepnúť pO₂ graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> - <translation type="unfinished"/> + <translation>Prepnúť pN₂ graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> - <translation type="unfinished"/> + <translation>Prepnúť fotografie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> - <translation type="unfinished"/> + <translation>&Filtruj zoznam ponorov</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> + <translation>Prepnúť graf tkanív</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> - <translation type="unfinished"/> + <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Tlačiť</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&Ukončiť</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Import z &počítača</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Prečisluj</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>&Editovať názov zariadenia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>&Pridanie ponoru</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>&Automatické zoskupovanie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>&Ročné štatistiky</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>Zoznam &ponorov</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>P&redchádzajúci DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Šipka v ľavo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Šipka v pravo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>Uživateľský &manuál</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>P&lánovanie ponoru</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>Import z &log súborov</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Import log súborov z iných aplikácii</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Otvoriť súbor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Vytlačiť runtime tabuľku</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Uložiť zmeny?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Uložiť súbor ako</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Otvoriť log súbor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <source>Changes will be lost if you don't save them.</source> <translation>Zmeny budu stratené ak ich neuložíš.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Upozornenie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Ročná štatistika</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3337,8 +3469,48 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> + <translation>Filter zobrazuje %1 (z %2) ponorov</translation> + </message> +</context> +<context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> <translation type="unfinished"/> </message> </context> @@ -3400,387 +3572,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Predvolené</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Jednotky</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Graf</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Jazyk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Sieť</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Veľkosť fontu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Ponory</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Použiť prednastavenú hodnotu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animácie</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Rýchlosť</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Zmazať všetky nastavenia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Nastaviť všetky nastavenia na pôvodné hodnoty</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Systém</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metrický</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperiálny</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personalizácia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Hĺbka</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>stopa</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Systémove prednastavenia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Typ proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Vyžaduje autentifikáciu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Meno</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Heslo</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Tlak</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Zoznamy a tabuľky</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Predvolený súbor s ponormi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Zobraziť neplatné</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Predvolená fľaša</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Použi prednastavenú fľašu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface Webservice</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Predvolené užívateľské ID</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Uložiť uživateľské ID lokálne?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Objem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Teplota</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Hmotnosť</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Časové jednotky</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minuty</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Sekundy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Zobraziť</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow na max. hĺbke</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Rôzne</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Nastavenia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Menovateľ rýchlosti pre výstup/zostup</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Hranica pre zobrazenie pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Hranica pre zobrazenie pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Hranica pre zobrazenie pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Max ppO₂ pri zobrazení MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Strop určený počítačom zobraziť červenou</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Zobraziť nepoužité fľaše v záložke výstroja</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Zobraziť priemernú hĺbku</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Žiadne proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>Systémové proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Potrebný reštart</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Na korektné nahratie nového jazyka je potrebné reštartovať Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Po stlačení OK budú všetky Subsurface nastavenia zmenené na pôvodné hodnoty. Zmena nastane okamžite.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Otvoriť predvolený Log súbor</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Upozornenie</translation> </message> @@ -3907,72 +4094,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>neznámy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Ponor #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Max hĺbka: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Trvanie: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Použitá zmes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Značky:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Závažia:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Poznámky:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Oblek:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Viď:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Hodnotenie:</translation> </message> @@ -3980,103 +4167,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 z %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Zmazať tento počítač</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Pridaj zmenu zmesi</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> - <translation type="unfinished"/> + <translation> (Fľaša %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Pridať Bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Vymazať udalosť</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Schovaj podobné udalosti</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Editovať meno</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Zobraziť všetky udalosti</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Schovaj udalosti</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Schovať všetky %1 udalosti?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Zmazať vybrané udalosti?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Editovať meno záložky</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Voliteľné meno:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Príliš dlhý názov!</translation> </message> @@ -4091,7 +4278,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/diveplanner.cpp" line="39"/> <source>OXYGEN</source> - <translation type="unfinished"/> + <translation>KYSLÍK</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="224"/> @@ -4104,22 +4291,22 @@ p, li { white-space: pre-wrap; } <translation>Zatvoriť</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Priemer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Maximum</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Posuň mapu a dvojklikom označ miesto ponoru</translation> </message> @@ -4187,12 +4374,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Táto funkcia pre daný počítač zatiaľ nie je k dispozícii.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie je možné vytvoriť spojenie s počítačom.</translation> </message> @@ -4206,12 +4393,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Nové začiatočné číslo</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Nové číslo</translation> </message> @@ -4219,12 +4406,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Daná funkcia pre zvolený počítač zatiaľ nie je k dispozícii.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie je možné vytvoriť spojenie s počítačom.</translation> </message> @@ -4303,12 +4490,12 @@ p, li { white-space: pre-wrap; } <translation>Aký dátum a čas je zobrazený na fotke?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Otvoriť súbory s obrázkami</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Grafické súbory (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4358,6 +4545,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4381,8 +4682,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platformový potápačský denník<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4436,9 +4737,9 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> - <translation type="unfinished"/> + <translation>Obleky:</translation> </message> </context> <context> @@ -4452,11 +4753,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Pridaj fľašu</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4466,9 +4762,9 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> - <translation type="unfinished"/> + <translation>Značky:</translation> </message> </context> <context> @@ -4476,7 +4772,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/filtermodels.cpp" line="144"/> <source>Empty tags</source> - <translation type="unfinished"/> + <translation>Žiadne značky</translation> </message> </context> <context> @@ -4516,54 +4812,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Kontrola novšej verzie.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface nedokázal skontrolovať existenciu novšej verzie.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Vyskytla sa nasledujúca chyba:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Prosím, skontroluj pripojenie na internet.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> - <translation type="unfinished"/> + <translation>Používaš poslednu verziu Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> - <translation type="unfinished"/> + <translation>Nová verzia Subsurface je k dispozícii.<br/>Klikni na:<br/><a href="%1">%1</a><br/>.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> - <translation type="unfinished"/> + <translation>K dispozícii je nová verzia Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation>Najnovšia verzia je %1, over si možnosti OS updatu.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation>Najnovšia verzia je</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Pri pokuse skontrolovat existenciu novšej verzie nastala chyba.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4583,64 +4899,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Radi by sme sa dozvedeli viac o naších užíveteľoch, ich preferenciach a zvyklostiach. Vyplň prosím tento krátky dotazník a odošli ho Subsurface teamu. Vyber všetky možnosti ktoré sa Ťa týkajú.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Dotazník</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Subsurface dotazník</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Rekreačný potápač</translation> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Technický potápač</translation> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Záujem o plánovanie ponorov</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Nahrávanie ponorov z podporovaných počítačov</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Importovanie ponorov z iných zdrojov</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Ručné pridávanie ponorov</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Používam Android companion app na sledovanie potápačských lokalít</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Napíš nám prosím svoje návrhy (v angličtine) do boxu nižšie</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Nasledujúce informácie o Tvojom systéme budú taktiež odoslané</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4788,7 +5114,7 @@ OS CPU Architecture: %1</source> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/> <source>Transferring data...</source> - <translation type="unfinished"/> + <translation>Prenášanie dát...</translation> </message> </context> <context> @@ -4812,12 +5138,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Daná funkcia pre zvolený počítač zatiaľ nie je k dispozícii.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nie je možné vytvoriť spojenie s počítačom.</translation> </message> @@ -4825,76 +5158,76 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Rok > Mesiac / Akcia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Trvanie Celkové</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation>Priemer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation>Najkratší</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation>Najdlhší</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Hĺbka (%1) Priemer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Priemer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4910,13 +5243,13 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4927,16 +5260,16 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4962,120 +5295,120 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>US libra</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) alebo (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>vzduch</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integrované</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>opasok</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>členok</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>backplate závažie</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Chyba pri načítaní '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> - <translation type="unfinished"/> + <translation>Poseidon import zlyhal: neviem načítať '%s'</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> - <translation type="unfinished"/> + <translation>Vypnúť</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> - <translation type="unfinished"/> + <translation>O₂ kalibrácia zlýhala</translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> - <translation type="unfinished"/> + <translation>O₂ kalibrácia</translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> - <translation type="unfinished"/> + <translation>Pre súbor '%s' nebol nájdený zodpovedajúci počítač</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maximálny počet podporovaných stĺpcov pre CSV import je %d</translation> </message> @@ -5094,9 +5427,9 @@ Maximum</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> - <translation type="unfinished"/> + <translation>batéria</translation> </message> <message> <location filename="../cochran.c" line="366"/> @@ -5108,7 +5441,7 @@ Maximum</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>výstup</translation> @@ -5155,7 +5488,7 @@ Maximum</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5278,7 +5611,7 @@ Maximum</translation> <message> <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> - <translation type="unfinished"/> + <translation>Chyba spracovania teploty</translation> </message> <message> <location filename="../libdivecomputer.c" line="501"/> @@ -5298,7 +5631,7 @@ Maximum</translation> <message> <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> - <translation type="unfinished"/> + <translation>Chyba načítania módu ponoru</translation> </message> <message> <location filename="../libdivecomputer.c" line="562"/> @@ -5311,44 +5644,44 @@ Maximum</translation> <translation>Chyba spracovania vzoriek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Udalosť: Čakanie na vstup uživateľa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Chyba registrácia správcu udalosti.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Chyba registrácie správcu ukončenia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Chyba importu dát</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Problém inicializácie libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Nie je možné otvoriť %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> - <translation type="unfinished"/> + <translation>Nedostatočné privilégia na otvorenie zariadenia </translation> </message> <message> <location filename="../parse-xml.c" line="506"/> @@ -5365,226 +5698,261 @@ Maximum</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Neúspešná požiadavka: get_events.⏎ -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Databázová požiadavka get_tags zlýhala. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Spojenie s databázou zlýhalo '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Požiadavka na databázu zlyhala '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Databázová požiadavka get_cylinders zlýhala. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. </source> - <translation>Databázová požiadavka get_changes zlyhala. + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Spojenie s databázou zlýhalo '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Databázová požiadavka get_profile_sample zlyhala. + <translation>Požiadavka na databázu zlyhala '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Neviem otvoriť šablónu </translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Neviem nájsť zmes %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Príliš veľa zmesí</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Výpočet dekompresie zrušený z dôvodu píliš dlhého času</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>na základe GFlow = %d a GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurface plán ponoru</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>hĺbka</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>trvanie</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>plyn</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> - <translation type="unfinished"/> + <translation>Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s (SP = %.1fbar) +</translation> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> - <translation type="unfinished"/> + <translation>Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s (SP = %.1fbar) +</translation> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> - <translation type="unfinished"/> + <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> - <translation type="unfinished"/> + <translation>Zmena plynu na %s (SP = %.1fbar) +</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Zmena plynu na %s </translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Spotreba plynu: </translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Upozornenie:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> - <translation type="unfinished"/> + <translation>VAROVANIE: TOTO JE NOVÁ IMPLEMENTÁCIA BUHLMANOVHO ALGORITMU A NA ŇOM IMPLEMENTOVANÝ PLÁNOVAČ PONOROV, KTORÝ VŠAK BOL MINIMÁLNE TESTOVANÝ. V ŽIADNOM PRÍPADE SA NEDOPORUČUJE PLÁNOVAŤ SKUTOČNÉ PONORY LEN POMOCOU TOHTO PROGRAMU.</translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <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="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <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="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s z %s (%.0f%s/%.0f%s v plánovanom výstupe)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s počas plánovaného výstupu) z %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5593,70 +5961,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5665,7 +6033,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5674,162 +6042,168 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Bezpečnostná zastávka: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Bezpečnostná zastávka: neznáma @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: neznáma @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>V deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Vypočítaný strop %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tkanivo %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>tep srdca: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>smer: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 ponorov)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 ponor)</translation> </message> @@ -5931,7 +6305,7 @@ EADD: %d%s <message> <location filename="../dive.c" line="30"/> <source>OC-gas</source> - <translation type="unfinished"/> + <translation>OC-zmes</translation> </message> <message> <location filename="../dive.c" line="30"/> @@ -5941,7 +6315,7 @@ EADD: %d%s <message> <location filename="../dive.c" line="30"/> <source>oxygen</source> - <translation type="unfinished"/> + <translation>kyslík</translation> </message> <message> <location filename="../dive.c" line="232"/> @@ -5994,97 +6368,97 @@ EADD: %d%s <translation>(žiadné ponory)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Ne</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Po</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Ut</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>St</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Št</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Pi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>So</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Máj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -6196,7 +6570,7 @@ Je Uemis Zurich korektne pripojený?</translation> <message> <location filename="../uemis-downloader.c" line="853"/> <source>Initialise communication</source> - <translation type="unfinished"/> + <translation>Inicializácia komunikácie</translation> </message> <message> <location filename="../uemis-downloader.c" line="855"/> @@ -6211,72 +6585,72 @@ Je Uemis Zurich korektne pripojený?</translation> <message> <location filename="../uemis.c" line="196"/> <source>Safety stop violation</source> - <translation type="unfinished"/> + <translation>Nedodržaná bezpečnostná zastávka</translation> </message> <message> <location filename="../uemis.c" line="198"/> <source>Speed alarm</source> - <translation type="unfinished"/> + <translation>Alarm: Rýchlosť</translation> </message> <message> <location filename="../uemis.c" line="201"/> <source>Speed warning</source> - <translation type="unfinished"/> + <translation>Upozornenie: Rýchlosť</translation> </message> <message> <location filename="../uemis.c" line="203"/> <source>pO₂ green warning</source> - <translation type="unfinished"/> + <translation>pO₂ Upozornenie: Zelená</translation> </message> <message> <location filename="../uemis.c" line="206"/> <source>pO₂ ascend warning</source> - <translation type="unfinished"/> + <translation>pO₂ Upozornenie: Výstup</translation> </message> <message> <location filename="../uemis.c" line="208"/> <source>pO₂ ascend alarm</source> - <translation type="unfinished"/> + <translation>pO₂ Alarm: Výstup</translation> </message> <message> <location filename="../uemis.c" line="212"/> <source>Tank pressure info</source> - <translation type="unfinished"/> + <translation>Info: Tlak vo fľaši</translation> </message> <message> <location filename="../uemis.c" line="214"/> <source>RGT warning</source> - <translation type="unfinished"/> + <translation>Upozornenie: zostávajúci čas plynu</translation> </message> <message> <location filename="../uemis.c" line="216"/> <source>RGT alert</source> - <translation type="unfinished"/> + <translation>Alarm: zostávajúci čas plynu</translation> </message> <message> <location filename="../uemis.c" line="218"/> <source>Tank change suggested</source> - <translation type="unfinished"/> + <translation>Odporúčaná zmena fľaše</translation> </message> <message> <location filename="../uemis.c" line="220"/> <source>Depth limit exceeded</source> - <translation type="unfinished"/> + <translation>Prekročená maximálna hĺbka</translation> </message> <message> <location filename="../uemis.c" line="222"/> <source>Max deco time warning</source> - <translation type="unfinished"/> + <translation>Upozornenie: Max. dekompresný čas</translation> </message> <message> <location filename="../uemis.c" line="224"/> <source>Dive time info</source> - <translation type="unfinished"/> + <translation>Info: Čas Ponoru</translation> </message> <message> <location filename="../uemis.c" line="226"/> <source>Dive time alert</source> - <translation type="unfinished"/> + <translation>Alarm: Času ponoru</translation> </message> <message> <location filename="../uemis.c" line="228"/> @@ -6286,17 +6660,17 @@ Je Uemis Zurich korektne pripojený?</translation> <message> <location filename="../uemis.c" line="230"/> <source>No tank data</source> - <translation type="unfinished"/> + <translation>Žiadne informácie o fľaši</translation> </message> <message> <location filename="../uemis.c" line="232"/> <source>Low battery warning</source> - <translation type="unfinished"/> + <translation>Upozornenie: Slabá batéria</translation> </message> <message> <location filename="../uemis.c" line="234"/> <source>Low battery alert</source> - <translation type="unfinished"/> + <translation>Alarm: Slabá batéria</translation> </message> <message> <location filename="../save-html.c" line="434"/> @@ -6373,12 +6747,12 @@ Je Uemis Zurich korektne pripojený?</translation> <message> <location filename="../save-html.c" line="461"/> <source>Trips</source> - <translation type="unfinished"/> + <translation>Akcie</translation> </message> <message> <location filename="../save-html.c" line="463"/> <source>Advanced search</source> - <translation type="unfinished"/> + <translation>Pokročilé vyhľadávanie</translation> </message> <message> <location filename="../save-html.c" line="469"/> @@ -6428,27 +6802,27 @@ Je Uemis Zurich korektne pripojený?</translation> <message> <location filename="../save-html.c" line="480"/> <source>Average time</source> - <translation type="unfinished"/> + <translation>Priemerný čas</translation> </message> <message> <location filename="../save-html.c" line="481"/> <source>Shortest time</source> - <translation type="unfinished"/> + <translation>Najkratší čas</translation> </message> <message> <location filename="../save-html.c" line="482"/> <source>Longest time</source> - <translation type="unfinished"/> + <translation>Najdlhší čas</translation> </message> <message> <location filename="../save-html.c" line="483"/> <source>Average depth</source> - <translation type="unfinished"/> + <translation>Priemerná hĺbka</translation> </message> <message> <location filename="../save-html.c" line="484"/> <source>Min. depth</source> - <translation type="unfinished"/> + <translation>Min. hĺbka</translation> </message> <message> <location filename="../save-html.c" line="485"/> @@ -6458,57 +6832,57 @@ Je Uemis Zurich korektne pripojený?</translation> <message> <location filename="../save-html.c" line="487"/> <source>Min. SAC</source> - <translation type="unfinished"/> + <translation>Min. spotreba</translation> </message> <message> <location filename="../save-html.c" line="488"/> <source>Max. SAC</source> - <translation type="unfinished"/> + <translation>Max. spotreba</translation> </message> <message> <location filename="../save-html.c" line="489"/> <source>Average temp.</source> - <translation type="unfinished"/> + <translation>Priemerná teplota</translation> </message> <message> <location filename="../save-html.c" line="490"/> <source>Min. temp.</source> - <translation type="unfinished"/> + <translation>Min. teplota</translation> </message> <message> <location filename="../save-html.c" line="491"/> <source>Max. temp.</source> - <translation type="unfinished"/> + <translation>Max. teplota</translation> </message> <message> <location filename="../save-html.c" line="492"/> <source>Back to list</source> - <translation type="unfinished"/> + <translation>Spǎť na zoznam</translation> </message> <message> <location filename="../save-html.c" line="498"/> <source>Dive equipment</source> - <translation type="unfinished"/> + <translation>Vybavenie ponoru</translation> </message> <message> <location filename="../save-html.c" line="501"/> <source>Work pressure</source> - <translation type="unfinished"/> + <translation>Pracovný tlak</translation> </message> <message> <location filename="../save-html.c" line="502"/> <source>Start pressure</source> - <translation type="unfinished"/> + <translation>Počiatočný tlak</translation> </message> <message> <location filename="../save-html.c" line="503"/> <source>End pressure</source> - <translation type="unfinished"/> + <translation>Koncový tlak</translation> </message> <message> <location filename="../save-html.c" line="511"/> <source>Dive status</source> - <translation type="unfinished"/> + <translation>Stav ponoru</translation> </message> <message> <location filename="../save-html.c" line="486"/> @@ -6594,17 +6968,17 @@ Je Uemis Zurich korektne pripojený?</translation> <message> <location filename="../worldmap-save.c" line="43"/> <source>Max. depth:</source> - <translation type="unfinished"/> + <translation>Max. hĺbka:</translation> </message> <message> <location filename="../worldmap-save.c" line="46"/> <source>Air temp.:</source> - <translation type="unfinished"/> + <translation>Tepl. vzduchu:</translation> </message> <message> <location filename="../worldmap-save.c" line="48"/> <source>Water temp.:</source> - <translation type="unfinished"/> + <translation>Tepl. vody:</translation> </message> <message> <location filename="../worldmap-save.c" line="50"/> @@ -6772,7 +7146,7 @@ Je Uemis Zurich korektne pripojený?</translation> <message> <location filename="../qt-ui/plannerSettings.ui" line="528"/> <source>Verbatim dive plan</source> - <translation type="unfinished"/> + <translation>Ukecaný plán ponoru</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="387"/> diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index 6f0b4546e..99b379e4f 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -5,12 +5,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"></translation> </message> @@ -26,32 +26,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"></translation> </message> @@ -849,70 +849,70 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"></translation> </message> @@ -1070,22 +1070,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"></translation> </message> @@ -1093,18 +1093,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation type="unfinished"></translation> @@ -1113,97 +1113,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation type="unfinished"></translation> </message> @@ -1211,87 +1211,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"></translation> </message> @@ -1299,54 +1299,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation type="unfinished"></translation> </message> @@ -1361,107 +1356,133 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation type="unfinished"></translation> </message> @@ -1472,77 +1493,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> + <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> - <source>Send the dive data to divelogs.de website.</source> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> - <source>Send the dive data to dive-share.appspot.com website</source> + <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> - <source>HTML export of the dive locations, visualized on a world map.</source> + <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> - <source>Subsurface native XML format.</source> + <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <source>Subsurface native XML format.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation type="unfinished"></translation> </message> @@ -1581,7 +1608,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation type="unfinished"></translation> </message> @@ -1607,25 +1634,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation type="unfinished"></translation> </message> @@ -1640,100 +1667,160 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation type="unfinished"></translation> </message> @@ -1845,77 +1932,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation type="unfinished"></translation> </message> @@ -1966,127 +2068,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation type="unfinished"></translation> </message> @@ -2189,54 +2291,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation type="unfinished"></translation> </message> @@ -2309,17 +2411,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2358,17 +2485,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"></translation> </message> @@ -2376,7 +2503,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation type="unfinished"></translation> </message> @@ -2384,7 +2511,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"></translation> </message> @@ -2400,347 +2527,347 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation type="unfinished"></translation> </message> @@ -2748,92 +2875,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2842,486 +2969,491 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"></translation> </message> @@ -3329,12 +3461,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3392,387 +3564,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation type="unfinished"></translation> </message> @@ -3899,72 +4086,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation type="unfinished"></translation> </message> @@ -3972,103 +4159,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation type="unfinished"></translation> </message> @@ -4096,22 +4283,22 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation type="unfinished"></translation> </message> @@ -4179,12 +4366,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"></translation> </message> @@ -4198,12 +4385,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation type="unfinished"></translation> </message> @@ -4211,12 +4398,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"></translation> </message> @@ -4295,12 +4482,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"></translation> </message> @@ -4350,6 +4537,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4373,7 +4674,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> <translation type="unfinished"></translation> </message> </context> @@ -4428,7 +4729,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"></translation> </message> @@ -4444,11 +4745,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4458,7 +4754,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"></translation> </message> @@ -4508,53 +4804,73 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> <translation type="unfinished"></translation> </message> </context> @@ -4575,63 +4891,73 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> + <location filename="../qt-ui/usersurvey.ui" line="14"/> + <source>User Survey</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="14"/> - <source>User Survey</source> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> <translation type="unfinished"></translation> </message> <message> @@ -4801,12 +5127,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"></translation> </message> @@ -4814,70 +5147,70 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation type="unfinished"></translation> @@ -4892,13 +5225,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation type="unfinished"></translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation type="unfinished"></translation> </message> @@ -4909,16 +5242,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation type="unfinished"></translation> </message> @@ -4944,120 +5277,120 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation type="unfinished"></translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"></translation> </message> @@ -5076,7 +5409,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"></translation> </message> @@ -5090,7 +5423,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation type="unfinished"></translation> @@ -5137,7 +5470,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5293,42 +5626,42 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"></translation> </message> @@ -5346,429 +5679,472 @@ Maximum</source> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> <translation type="unfinished"></translation> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation type="unfinished"></translation> </message> @@ -5933,97 +6309,97 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation type="unfinished"></translation> </message> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index 204743302..4ee20dcc2 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation>Person:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation>Sök efter parkamrater och divemasters</translation> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Kunde inte spara backupfilen %1. Felmeddelande: %2</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation>Kunde inte öppna backupfilen: %1</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation>Dykdatorns detaljer lästa</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation>Inställningarna sparade till enheten</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation>Enhetens firmware uppdaterades framgångsrikt</translation> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation>Enhetens inställningar återställdes</translation> </message> @@ -847,72 +847,72 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation>Backupfiler (*.xml)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation>Ett fel inträffade när backupfilen skulle sparas. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation>Backup sparad</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation>Dina inställningar har blivit sparade till: %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation>Backuppa dykdatorns inställningar</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation>XML backup fel</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation>Återställ dykdatorns inställningar</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation>XML återställningsfel</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ett fel inträffade när backupfilen skulle återställas. %1</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation>Återställda</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation>Dina inställningar har blivit återställda</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation>Välj en firmware-fil</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation>Alla filer (*.*)</translation> </message> @@ -1071,22 +1071,22 @@ radera den valda dykdatorn?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Enhetsid</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Enhetsnamn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Klicka här för att ta bort denna dykdator</translation> </message> @@ -1094,18 +1094,18 @@ radera den valda dykdatorn?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Bailout till öppet system</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>start</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>slut</translation> @@ -1114,97 +1114,97 @@ radera den valda dykdatorn?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Rankning</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation>Ljup(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation>Temperatur(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation>Vikt(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Dräkt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Cyl</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Plats</translation> </message> @@ -1212,87 +1212,87 @@ radera den valda dykdatorn?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Expandera alla</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Sammanslå alla</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Fäll samman andra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Ta bort dyk från resa</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>Ny resa ovan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>Lägg till dyk(en) till resan ovan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>Lägg till dyk(en) till resan nedanför</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>Sammanfoga resa med resan ovan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>Sammanfoga resa med resan under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Radera dyk(en)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>Markera dyk som ogiltiga</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Slå samman valda dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Uppdatera numrering</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Förskjut tid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Ladda bilder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Öppna bildfler</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1300,54 +1300,49 @@ radera den valda dykdatorn?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Exportformat</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Värdskarta</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Markering</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Markerade dyk</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Alla dyk</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1362,107 +1357,133 @@ radera den valda dykdatorn?</translation> <translation>Exportera</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation>DiveShare</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation>Bildernas ljup</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Allmänna inställningar</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Subsurface siffror</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation>Exportera årsvis statestik</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Exportera enbart listan</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Utseende</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Fontstorlek</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Ljus</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Sand</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF filer (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV filer (*.csv *.CSV)</translation> </message> @@ -1473,77 +1494,83 @@ radera den valda dykdatorn?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>Kommaseparerade värden som innehåller den mest relevanta informationen om dykprofilen.</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Skicka dykdatan till divelogs.de.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation>Skicka dykdatan till websidan dive-share.appspot.com</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML-export av dykplatser visualiserade på en världskarta.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Subsurface eget XML-format.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation>Skriv ljupet av bilderna till fil.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>Exportera som UDDF fil</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>Exportera CSV-fil som</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Exportera världskarta</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTMLfiler (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Exportera Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML filer (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation>Spara bildernas ljup</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Exportera HTML filer son</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>Kan inte öppna fil %s</translation> </message> @@ -1582,7 +1609,7 @@ radera den valda dykdatorn?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Tid</translation> </message> @@ -1608,25 +1635,25 @@ radera den valda dykdatorn?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>Fältavskiljare</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Enheter</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metrisk</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Imperial</translation> </message> @@ -1641,100 +1668,160 @@ radera den valda dykdatorn?</translation> <translation>Manuella dykloggar</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation>Välj ordningen på dag, månad och år för datumformatet. Fältdelarna kan vara .-/.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation>Datumformat</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation>dd.mm.yyyy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation>mm/dd/yyyy</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation>yyyy-mm-dd</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Dyk #</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation>Datum på något av följande format dd.mm.yyyy, yyyy-mm-dd eller mm/dd/yyyy.</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation>Dykets längd i sekunder eller i minuter:sekunder</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Taggar</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Plats</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Maxdjup</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Fältkonfiguration</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>Medeldjup</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Parkamrat</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Anteckningar</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Vikt</translation> </message> @@ -1846,77 +1933,92 @@ radera den valda dykdatorn?</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Djup</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Tryck</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Färg</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>Tryck S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation>Omgivande tryck</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>Tryck I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Användarinmatad</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Flaskid</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Tak</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1967,127 +2069,127 @@ radera den valda dykdatorn?</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Rankning</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Djup</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Vikt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation>Vikt(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Dräkt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Cyl</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Plats</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation>Ljup(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation>Temperatur(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2191,54 +2293,54 @@ radera den valda dykdatorn?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Försök igen</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>Hitta Uemis dykdator</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>Välj fil som loggfil för nerladdningen ifrån dykdatorn</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Loggfiler (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Varning</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Att spara en libdivecomputer-dump kommer inte att ladda ner dyken till dyklistan.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>Välj fil för binär dumpning av nerladdningen ifrån dykdatorn</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>Dumpfiler (*.bin)</translation> </message> @@ -2311,17 +2413,42 @@ radera den valda dykdatorn?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation>Nyckel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation>Värde</translation> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2360,17 +2487,17 @@ radera den valda dykdatorn?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation>Mjukvaruuppdateringen misslyckades!</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kunde inte upprätta en koppling till dykdatorn.</translation> </message> @@ -2378,7 +2505,7 @@ radera den valda dykdatorn?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Ändra valda dykplatser</translation> </message> @@ -2386,7 +2513,7 @@ radera den valda dykdatorn?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation>Platts:</translation> </message> @@ -2402,330 +2529,330 @@ radera den valda dykdatorn?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Plats</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Koordinater</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Parkamrat</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Taggar</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Rankning</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Synlighet</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Dräkt</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Dykanteckningar</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Lufttemp</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Vattentemperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Anteckningar</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Utrustning</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Gasanvändning</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Gasanvändning</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Maxdjup</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Lufttryck</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Dyktid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Total tid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Gasförbrukning</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation>Extra data</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation>Extra data ifrån dykdator</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Information</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>Intervall</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Medeldjup</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Salthalt</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Statistik</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Djup</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Flaskor</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Vikter</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation>Applicera förändringar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation>Kasta förändringar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Lägg till flaska</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation>Lägg till viktsystem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Lufttemperatur [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Vattentemperatur [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Detta resmål håller på och ändras.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Flera dyk håller på och ändras.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Detta dyk håller på och ändras.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Resmålsanteckningar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Resmål</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Djupaste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Grundaste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation>Högsta totala SAC på ett dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation>Lägsta totala SAC på ett dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation>Genomsnittlig SAC av alla dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation>Högsta templeratur</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation>Lägsta temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation>Snitttemperatur på alla valda dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation>Längsta dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation>Kortaste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation>Genomsnittlig längd på alla valda dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2734,17 +2861,17 @@ mixas av luft och: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>och</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Kassera ändringarna?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>Du är påväg att kasta bort dina förändringar</translation> </message> @@ -2752,92 +2879,92 @@ mixas av luft och: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&File</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation>Exportera dykloggar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>Slå av/på pHe grafen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Slå av/på beräkningen av alla vävnader</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>Slå av/på dykdatorrapporterat takinformation</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Slå av/på beräknad takinformation</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation> Slå av/på NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Slå av/på beräknad takinformation i 3m steg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation>Konfigurera &dykdatorer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation>Planera-om &dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Slå av/på hjärtrytm</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>Slå av/på MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>Slå av/på EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>Slå av/på SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Slå av/på mätverktyget</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Dykplansdetaljer</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Skriv ut</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2850,486 +2977,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Logg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Visa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Hjälp</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Ny Loggbok</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Ny</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Öppna loggbok</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Öppna</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Spara</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Spara</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>Spara som(&v)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Spara som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>Stäng</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Stäng</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>Inställning&r</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importera &GPSdata från Subsurface webbtjänst</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation>Kopiera dyk-komponeneter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation>Klistra in dykkomponenter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>&Alla</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>&Nästa DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>Om Subsurface(&a)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>&Globen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>Importera &från divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>&Fullskärm</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Växla fullskärmsläge</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>&Sök efter uppdateringar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>&Exportera</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation>Växla pO₂ graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation>Växla pN₂ graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation>Skala graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation>Växla bilder</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation>Växla flaskgrafen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation>&Filtrera dyklista</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation>Växla vävnadsgraf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Skriv ut</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&Avsluta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>Ladda ner från dykdator</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Renumrering</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>&Ändra Enhetsnamn</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>Lägg till dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>Autogruppering</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>&Årsstatistik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>Dyklista</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>Fö&regående dykdator</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Vänster</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Höger</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>Användar&manual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>P&lanera dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>&Importera loggfiler</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Importera loggfiler ifrån andra applikationer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Öppna fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <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="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <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="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>Skriv ut körtidstabell</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <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="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <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="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Spara ändringar?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>Spara fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Öppna dyklogg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation>Dykloggfiler (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran-filer (*.can);;CSV-filer (*.csv);;DiveLog.de-filer (*.dld);;JDiveLog filer (*.jlb);;Liquivision-filer (*.lvd);;MkVI filer (*.txt);;Suunto-filer (*.sde *.db);;UDDF/UDCF-filer (*.uddf *.udcf);;XML-filer (*.xml);;All filer (*)</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <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="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Varning</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <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="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Årsstatistik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <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> @@ -3337,12 +3469,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter visar %1 (av %2) dyk</translation> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3400,387 +3572,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Standardvärden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Enheter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Graf</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Språk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Nätverk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Fontstorlek</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Dyk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Använd standardvärden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animationer</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Hastighet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Rensa alla inställningar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Återställ alla inställningar till deras standardvärde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metrisk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Personifiera</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Djup</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>fot</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>ft³</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Systemets standardvärde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Proxy typ</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Värd</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Kräver authentisering</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Användarnamn</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Lösenord</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Tryck</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Listor och tabeller</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Standard dykloggfil</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>Display ogiltig</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Standardflaska</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Använd standardflaska</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface webbtjänst</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Förvalt användarid</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Spara användarid lokalt?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Volym</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Vikt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Tidsenheter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Minuter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Sekunder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Visa</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>GFLow på maxdjup</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Blandat</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Inställningar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>Hastighetsnämnare</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>Tröskelvärde vid visning av pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>Tröskelvärde vid visning av pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>Tröskelvärde vid visning av pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>Maximalt pO₂, för visning av MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>Visa dykdatorrapporterad takinformation i rött</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Visa oanvända flaskor i utrustningsfliken</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Visa medeldjup</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>Ingen proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>System proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Omstart krävs</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>För att ladda nytt språk fullständigt måste Subsurface startas om.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Om du klickar OK, alla inställningar i Subsurface kommer att återställas till deras standardvärden. Det här kommer att hända omedelbart.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Öppna standarddykloggen</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Varning</translation> </message> @@ -3907,72 +4094,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>okänd</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Dyk #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Maxdjup: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Varaktighet: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Gas använd:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Taggar:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Vikter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Anteckningar:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>Parkamrat:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>Dräkt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Ranking:</translation> </message> @@ -3980,103 +4167,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Visa NDL / TTS stängdes av pga att det tog för lång tid att beräkna</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>Gör till första dykdator</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Ta bort den här dykdatorn</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Lägg till gasbyte</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation> (Flaska %1)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation>Lägg till set-point byte</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Lägg till bokmärke</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>Ta bort händelse</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Göm liknande händelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>Ändra namn</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <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="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>Visa alla händelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Göm händelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>Göm alla %1händelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Ta bort markerad händelse</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Ändra namnet på bokmärket</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Valt namn:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>Namnet är för långt!</translation> </message> @@ -4104,22 +4291,22 @@ p, li { white-space: pre-wrap; } <translation>Stäng</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Genomsnitt</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Maximum</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>Flytta runt kartan och dubbelklicka för att ställa in dykplats</translation> </message> @@ -4187,12 +4374,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kunde inte upprätta en koppling till dykdatorn.</translation> </message> @@ -4206,12 +4393,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Nytt startnummer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Nytt nummer</translation> </message> @@ -4219,12 +4406,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kunde inte upprätta en koppling till dykdatorn.</translation> </message> @@ -4303,12 +4490,12 @@ p, li { white-space: pre-wrap; } <translation>Vilket datum och tid visas på bilden?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Öppna bildfler</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4358,6 +4545,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4381,8 +4682,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-plattforms dykprogramvara<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, med fler, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4436,7 +4737,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation>Dräkter:</translation> </message> @@ -4452,11 +4753,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Lägg till flaska</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4466,7 +4762,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation>Taggar:</translation> </message> @@ -4516,54 +4812,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Sök efter uppdateringar</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface kunde inte kolla efter uppdateringar.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>Följande fel inträffade:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Verifiera att du har en fungerande uppkoppling till internet.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation>Du använder dig av den senaste versionen av Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>En ny version av Subsurface finns tillgänglig.<br/>Klicka på:<br/><a href="%1">%1</a><br/> för att ladda ner den.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation>En ny version av Subsurface finns tillgänglig.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation>Senaste versionen är %1, vänligen kontakta din OS distributör för uppdateringar.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation>Senast släppta version är</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Ett fel uppstod vid sökningen efter uppdateringar.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4583,64 +4899,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>Vi skulle vilja lära oss mer om våra användare, vad ni fördrar och hur ni använder programmet. Teamet som gör denna programvara skulle gjärna vilja lära sig mer om våra användare. Ta gärna en minut och fyll i detta formulär och skicka in det till oss. Välj alla val som passar för dig.</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Användarundersökning</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Subsurface användarundersökning</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>Sportdykare</translation> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Teknisk dykare</translation> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>Intresserad av dykplanering</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Jag laddar ner mina dyk ifrån en stöd dykdator</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Jag importerar dyk ifrån annan mjukvara / källor</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Jag matar manuellt in mina dyk</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>Jag använder Android companion app för att hantera dykplattser</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>Skriv in dina förslag (på Engelska) i rutan nedan</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>Följande information om din dator kommer också att skickas</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4810,12 +5136,19 @@ OS CPU Arkitektur: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation>Kunde inte upprätta en koppling till dykdatorn.</translation> </message> @@ -4823,76 +5156,76 @@ OS CPU Arkitektur: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>År > Månad / Resa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Varaktighet Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation>Genomsnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation>Kortaste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation>Längsta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Djup (%1) Medel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Medel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4908,13 +5241,13 @@ Medel</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4925,16 +5258,16 @@ Medel</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4960,120 +5293,120 @@ Medel</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>pund</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>luft</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>integrerat</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>bälte</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>ankel</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>Ryggplattans vikt</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Kunde inte öppna '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>Kunde inte öppna CSV-fil %s; var vänlig och använd dialogen för att importera logfiler</translation> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon inläsning misslyckades: kunde inte läsa '%s'</translation> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation>Bitmunstycke i position OC</translation> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation>Bitmunstycke i position CC</translation> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation>Bitmunstycke i position okänd</translation> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation>Bitmunstycke i position, ingen kontakt</translation> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation>Ström av</translation> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation>O₂ kalibrering misslyckades</translation> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation>O₂ kalibrering</translation> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation>Ingen matchande dykdator för filen '%s'</translation> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maximalt antalet kolumner i CSV import är %d</translation> </message> @@ -5092,7 +5425,7 @@ Medel</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation>batteri</translation> </message> @@ -5106,7 +5439,7 @@ Medel</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>uppstigning</translation> @@ -5153,7 +5486,7 @@ Medel</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5309,42 +5642,42 @@ Medel</translation> <translation>Kunde inte tolka sampel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Händelse: väntar på användaren</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Kunde inte registrera event-funktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Kunde inte registrera avbrytningsrutin</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Lyckades inte importera dykdata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Kan inte skapa libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Kunde inte öppna fil %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Otillräckliga rättigheter för att öppna enheten %s %s (%s)</translation> </message> @@ -5363,222 +5696,254 @@ Medel</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Databasfråga get_events misslyckades. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>Databasfrågan get_tags misslyckades. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Databasanslutning misslyckades '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Databasfråga misslyckades '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>Databasfrågan get_cylinders misslyckades. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. </source> - <translation>Databasfrågan get_changes misslyckades. + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Databasanslutning misslyckades '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>Databasfrågan get_profile_sample misslyckades. + <translation>Databasfråga misslyckades '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>Kunde inte öppna formatmall %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>Kan inte hitta gas %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>För många gasblandningar</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Dekompressionsberäkningarna avbröts för de tog för lång tid</translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>baserad på GFlow = %d och GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurface dykplan</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>djup</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>körtid</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>varaktighet</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <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="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <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="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Byt gas till %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>Byt gas till %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gasförbrukning (CCR-delar exkluderade):</translation> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Gasförbrukning:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Varning:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>VARNING: DET HÄR ÄR EN NY IMPLEMENTATION AV BUHLMANN-ALGORITMEN OCH EN DYKPLANERARE BASERAD PÅ DENNA. DEN HAR BARA FÅTT EN BEGRÄNSAD MÄNGD TESTNING. VI REKOMENDERAR STARKT ATT INTE PLANERA DYK ENBART BASERADE PÅ DEN INFORMATION SOM GES HÄR.</translation> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <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="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <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="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s vid planerad uppstigning)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planerad uppstigning) av %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5587,70 +5952,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5659,7 +6024,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5668,162 +6033,168 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Säkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Säkerhetsstopp: okänd tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: okänd tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>I Deko </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>I deko (calc) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>Beräknat tak %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Vävnad %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>hjärtrytm: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>kurs: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dyk)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 dyk)</translation> </message> @@ -5988,97 +6359,97 @@ EADD: %d%s <translation>(inga dyk)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>sön</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>mån</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>tis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>ons</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>tor</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>fre</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>lör</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>maj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>dec</translation> </message> diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts index 6e8a5f31e..b9de92789 100644 --- a/translations/subsurface_tr.ts +++ b/translations/subsurface_tr.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1069,22 +1069,22 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Cihaz Kimliği</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Rumuz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Buraya tıklayarak dalış bilgisayarını kaldır.</translation> </message> @@ -1092,18 +1092,18 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>son</translation> @@ -1112,97 +1112,97 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Tarih</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Değerlendirme</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>libre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OZB</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>Azami MSS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Konum</translation> </message> @@ -1210,87 +1210,87 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Hepsini aç</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>Geziden dalış kaldır</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Dalış sil</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Seçili dalışları birleştir</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Dalışları yeniden numaralandır</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Görüntüleri yükle</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Görüntü dosyalarını aç</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Görüntü dosyaları (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1298,54 +1298,49 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Dışa aktarma biçimi</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Dünya haritası</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Seçim</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Seçili dalışlar</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Tüm dalışlar</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1360,107 +1355,133 @@ kaldırmak istediğinizden emin misiniz?</translation> <translation>Genel dışarı aktar</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Genel ayarlar</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Subsurface numaraları</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Sadece listeyi dışarı aktar</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Stil seçenekleri</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Yazı tipi</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Yazı tipi boyutu</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>kum</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF dosyaları (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV dosyaları (*.csv *.CSV)</translation> </message> @@ -1471,77 +1492,83 @@ kaldırmak istediğinizden emin misiniz?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> + <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>Divelogs.de web sitesine dalış verilerini gönder.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Subsurface doğal XML biçimi</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>UDDF dosyası olarak dışarı aktar</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>CSV dosyası olarak dışarı aktar</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>Dünya haritasını dışarı aktar</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML dosyaları (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Subsurface XML dışa aktar</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML dosyaları (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>HTML dosyası olarak dışarı aktar</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>%s dosyası açılamıyor</translation> </message> @@ -1580,7 +1607,7 @@ kaldırmak istediğinizden emin misiniz?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Zaman</translation> </message> @@ -1606,25 +1633,25 @@ kaldırmak istediğinizden emin misiniz?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Birimler</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Metrik</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>Emperyal</translation> </message> @@ -1639,100 +1666,160 @@ kaldırmak istediğinizden emin misiniz?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>Dalış #</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Tarih</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>Etiketler</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Konum</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>Azami derinlik</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>Alan yapılandırma</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Notlar</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Ağırlık</translation> </message> @@ -1844,77 +1931,92 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Derinlik</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Zaman</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Basınç</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Sıcaklık</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>Renk</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>Kullanıcı girdisi</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>Tüp indeksi</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>Tavan</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation type="unfinished"/> </message> @@ -1965,127 +2067,127 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Tarih</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Değerlendirme</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Derinlik</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Ağırlık</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>Azami MSS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Konum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>libre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OZB</translation> </message> @@ -2189,54 +2291,54 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>TAMAM</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Hata</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Yeniden dene</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>Kayıt dosyaları (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>Uyarı</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation type="unfinished"/> </message> @@ -2309,17 +2411,42 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2358,17 +2485,17 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2376,7 +2503,7 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>Seçili dalış konumlarını düzenle</translation> </message> @@ -2384,7 +2511,7 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2400,347 +2527,347 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Konum</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>Koordinatlar</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Divemaster(Dalış lideri)</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>Etiketler</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Değerlendirme</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Görünütlük</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>Dalış notları</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>Hava sıcaklığı.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>Su sıcaklığı.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Notlar</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Ekipman</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>Kullanılan gazlar</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>Tüketilen gaz</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>MSS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>Azami derinlik</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>Hava basıncı</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>Dalış süresi</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>Toplam süre</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>Gaz tüketimi</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Tarih</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Zaman</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>Dalış bilgisi</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>Ort. derinlik</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OZB</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>Tuzluluk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>İstatistikler</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Derinlik</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Sıcaklık</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Dalışlar</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>Fotoğraflar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Tüpler</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>Ağırlıklar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>Tüp ekle</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>Hava sıcaklığı. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>Su sıcaklığı. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>Bu gezi düzenleniyor.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>Çoklu dalış düzenleniyor.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>Bu dalış düzenleniyor.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>Gezi notları</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>Gezi konumu</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>Derin dalış</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>Sığ dalış</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>ve</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>Değişiklikleri silinsin mi ?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2748,92 +2875,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>&Dosya</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>pHe grafik değiştir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>Tüm doku hesaplamalarını değiştir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>Hesaplanan tavanı değiştir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>NDL, YZ geçişi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>Kalp atış hızı geçişi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>MOD değiştir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>EHD, END, EHYD değiştir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>Cetvel geçişi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Dalış planı detayları</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>Yazdır</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2842,486 +2969,491 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>&Kayıt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>&Görünüm</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>&Yardım</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>&İçe Aktar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>&Yeni seyir defteri</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Yeni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>&Seyir defteri aç</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>Aç</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>&Kaydet</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Kaydet</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>&Farklı kaydet</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Farklı kaydet</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>&Kapat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Kapat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>&Tercihler</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>&Subsurface web hizmetinden GPS verilerini içe aktar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>&Bilgi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>&Tümü</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>&Subsurface Hakkında</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>&Dünya</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>&divelogs.de'den içe aktar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>&Tam ekran</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>Tam ekran geçişi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>&Güncellemeler için denetle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>&Dışa aktar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>&Yazdır</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>&Çıkış</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>&Dalış bilgisayarından içe aktar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>&Yeniden numarala</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>&Cihaz adını düzenle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>&Dalış ekle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>&Otomatik grup</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>&Yıllık istatistikler</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>&Dalış listesi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>Sol</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>Sağ</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>&Kullanıcı rehberi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>&Dalış planı</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>&Kayıt dosyalarını içe aktar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>Diğer uygulamalardan dalış kayıt dosyalarını içe aktar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>Dosya aç</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>İptal</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Dosyayı kapatmadan önce geçerli dalışı düzenle, kaydet veya iptal et.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Bir dalış eklemeyi denemeden önce geçerli dalışı düzenle, kaydet veya iptal et.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>%1 dosyasında yapılan değişiklikleri kaydetmek istiyor musunuz?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Veri dosyasında yapılan değişiklikleri kaydetmek istiyor musunuz?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>Değişiklikler kaydedilsin mi ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>Dalış kayıt dosyasını aç</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>Uyarı</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Lütfen yeni bir dosya açmadan önce geçerli dalışı düzenle, kaydet veya iptal et.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>Yıllık istatistikler</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3329,12 +3461,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3392,387 +3564,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>Varsayılanlar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Birimler</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>Grafik</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>Lisan</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>Ağ</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Yazı tipi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Yazı tipi boyutu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Dalışlar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>Varsayılanı kullan</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>Animasyonlar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>Hız</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>Tüm ayarları temizle</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>Varsayılan değerler için tüm ayarları sıfırlayın</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>Sistem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Metrik</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>Emperyal</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>Kişisel</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Derinlik</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>metre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>fit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>litre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>santigrat</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>fahrenhayt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>Varsayılan sistem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>Kimlik doğrulaması gerektirir</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>Kullanıcı adı</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Parola</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Filtre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Basınç</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>Liste ve tablolar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>Varsayılan dalış kayıt dosyası</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>Varsayılan tüp</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>Varsayılan tüpü kullan</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface web hizmeti</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>Varsayılan kullanıcı kimliği</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>Yerel kullanıcı kimliği kaydedilsin mi ?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>Hacim</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Sıcaklık</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Ağırlık</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>libre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>Zaman birimleri</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>Dakika</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>Saniye</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>Göster</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>Azami derinlikte EFDüşük</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>Çeşitli</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Tercihler</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>Ekipman sekmesinde kullanılmayan tüpleri göster</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>Ortalama derinliği göster</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>EFDüşük</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>EFYüksek</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>Yeniden başlatma gerekli</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Subsurface yeni bir dil yüklemek için yeniden başlatmanız gerekir.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>Varsayılan kayıt dosyasını aç</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>Uyarı</translation> </message> @@ -3899,72 +4086,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>bilinmeyen</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>Dalış #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>Azami derinlik: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>Süre: %1 dak</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>Gaz kullanımı:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>Etiketler:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>Ağırlıklar:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>Notlar:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>Divemaster(Dalış lideri):</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>Değerlendirme:</translation> </message> @@ -3972,103 +4159,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>Dalış bilgisayarı sil</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>Gaz değişimi ekle</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>Yerimi ekle</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>OLay kaldır</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>Benzer olayları gizle</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>İsmi düzenle</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>Olayları gizle</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>Seçili olayları kaldırılsın mı ?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>Yeriminde ismi düzenle</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>Özel isim:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation>İsim çok uzun!</translation> </message> @@ -4096,22 +4283,22 @@ p, li { white-space: pre-wrap; } <translation>Kapat</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Ortalama</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Asgari</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Azami</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation type="unfinished"/> </message> @@ -4179,12 +4366,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4198,12 +4385,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Yeni başlama numarası</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>Yeni numara</translation> </message> @@ -4211,12 +4398,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4295,12 +4482,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>Görüntü dosyası aç</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Görüntü dosyaları (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4350,6 +4537,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4373,7 +4674,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> <translation type="unfinished"/> </message> </context> @@ -4428,7 +4729,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -4444,11 +4745,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>Tüp ekle</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4458,7 +4754,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4508,54 +4804,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>Güncellemeler için denetle</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface güncellemeleri kontrol edemedi.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>Lütfen internet bağlantınızı kontrol edin.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>Güncellemeleri kontrol etmeye çalışırken bir hata oluştu.<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4575,63 +4891,73 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>Kullanıcı Anketi</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Subsurface kullanıcı anketi</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>Teknik dalgıç</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>Dalışları desteklenen dalış bilgisayarından indiriyorum</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>Dalışları diğer yazılım / kaynaklardan içeriye aktarıyorum</translation> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>Dalışları el ile giriyorum</translation> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> <message> @@ -4804,12 +5130,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4817,78 +5150,78 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>Yıl > Ay / Seyahat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>Süre Toplam</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> Ortalama</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> Kısa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> Uzun</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>Derinlik (%1) Ortalama</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> Asgari</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> Azami</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>Sıcaklık (%1) @@ -4904,13 +5237,13 @@ Ortalama</translation> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4921,16 +5254,16 @@ Ortalama</translation> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>fit</translation> </message> @@ -4956,120 +5289,120 @@ Ortalama</translation> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>libre</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) veya (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>hava</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>entegre</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>kemer</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>ayak bileği</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>arka plaka ağırlığı</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>klipsli</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>'%s' okunamadı</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -5088,7 +5421,7 @@ Ortalama</translation> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5102,7 +5435,7 @@ Ortalama</translation> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>çıkış</translation> @@ -5149,7 +5482,7 @@ Ortalama</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5305,42 +5638,42 @@ Ortalama</translation> <translation>Örnekleri ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Olay: kullanıcı eylemi bekleniyor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), seri=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Olay işleyicisi kayıt hatası.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Dalış verisi içe aktarma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5358,283 +5691,320 @@ Ortalama</translation> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Veritabanı bağlantı başarısız '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Veritabanı sorgusu başarısız '%s'. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Veritabanı bağlantı başarısız '%s'. +</translation> + </message> + <message> + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. +</source> + <translation>Veritabanı sorgusu başarısız '%s'. +</translation> + </message> + <message> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>%s gaz bulunamıyor</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Çok fazla gaz karışımı</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurface dalış planı</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>derinlik</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>çalışma süresi</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>süre</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>gaz</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3ddak</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>MSS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OZB</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>Gaz tüketimi:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>Uyarı:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>MSS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5643,7 +6013,7 @@ EHYD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5652,150 +6022,156 @@ EHYD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %udak @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: bilinmeyen zaman @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>YZ: %udak </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>YZ: %udak (hesap) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation type="unfinished"/> </message> @@ -5960,97 +6336,97 @@ EHYD: %d%s <translation>(dalış yok)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>Pazar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>Pazartesi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>Salı</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>Çarşamba</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>Perşembe</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>Cuma</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>Cumartesi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Ocak</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Şubat</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Mart</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Nisan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Mayıs</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Haziran</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Temmuz</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Ağustos</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Eylül</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Ekim</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Kasım</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Aralık</translation> </message> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index ccdcd0799..ca0591dbc 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1069,22 +1069,22 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>Mô hình</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>Số hiệu Thiết Bị</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>Tên</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>Click vào đây sẽ loại bỏ thông tin về máy lặn này.</translation> </message> @@ -1092,18 +1092,18 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>Thoát đến OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>bắt đầu</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>kết thúc</translation> @@ -1112,97 +1112,97 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>Xlanh</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/nhỏ nhất</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>Địa điểm</translation> </message> @@ -1210,87 +1210,87 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>Mở rộng tất cả</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <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="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <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="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <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="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <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="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <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="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <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="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>Xóa (các)lần lặn</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <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="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Hợp nhất các lần lặn được chọn</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>Đánh dấu lại (các)lần lặn</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>Chuyển thời gian</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>Tải hình ảnh</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>Mở tập tin hình ảnh</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1298,54 +1298,49 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>Định dạng của dữ liệu xuất</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>Bản đồ thế giới</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>Lựa chọn</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>Các lần lặn đã được chọn</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>Tất cả các lần lặn</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1360,107 +1355,133 @@ bỏ các máy lặn đã được chọn?</translation> <translation>Chỉnh sửa chung cho xuất dữ liệu</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>Cài đặt chung</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Số hiệu Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>Chỉ danh sách xuất dữ liệu</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>Chỉnh phần trang trí</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>Kiểu chữ</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>Kích thước kiểu chữ</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>Giao diện</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Sáng</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Cát</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF files (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV files (*.csv *.CSV)</translation> </message> @@ -1471,77 +1492,83 @@ bỏ các máy lặn đã được chọn?</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> + <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> - <source>Send the dive data to divelogs.de website.</source> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> - <source>Send the dive data to dive-share.appspot.com website</source> + <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> - <source>HTML export of the dive locations, visualized on a world map.</source> + <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> - <source>Subsurface native XML format.</source> + <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <source>Subsurface native XML format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML files (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>Xuất dữ liệu dưới dạng Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML files (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>Xuất dữ liệu từ tập tin HTML dưới dạng</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> @@ -1580,7 +1607,7 @@ bỏ các máy lặn đã được chọn?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>Thời gian</translation> </message> @@ -1606,25 +1633,25 @@ bỏ các máy lặn đã được chọn?</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>Đơn vị</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>Số liệu</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation type="unfinished"/> </message> @@ -1639,100 +1666,160 @@ bỏ các máy lặn đã được chọn?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>Địa điểm</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>Bạn</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>Ghi chú</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>Cân nặng</translation> </message> @@ -1844,77 +1931,92 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>Thời gian</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>Áp suất</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>Nhiệt độ</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>SAC</translation> </message> @@ -1965,127 +2067,127 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>Nhiệt độ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>Xlanh</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/nhỏ nhất</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>Địa điểm</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2188,54 +2290,54 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>Lỗi</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>Thử lại</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation type="unfinished"/> </message> @@ -2308,17 +2410,42 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2357,17 +2484,17 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2375,7 +2502,7 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation type="unfinished"/> </message> @@ -2383,7 +2510,7 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2399,347 +2526,347 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>Địa điểm</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>Người lặn giỏi nhất</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>Bạn</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>Tầm nhìn</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>Ghi chú</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>Dụng cụ</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>Thời gian</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>Trạng thái</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>Nhiệt độ</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>Lần lặn</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>Xilanh</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/nhỏ nhất</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2747,92 +2874,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2841,486 +2968,491 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>Mới</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>Lưu lại</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>Lưu dưới dạng</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>Đóng lại</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3328,12 +3460,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3391,387 +3563,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>Đơn vị</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>Kiểu chữ</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>Kích thước kiểu chữ</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>Lần lặn</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>Số liệu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>Mật khẩu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>Bộ lọc</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>Áp suất</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>Nhiệt độ</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>Tùy biến</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -3898,72 +4085,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -3971,103 +4158,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4095,22 +4282,22 @@ p, li { white-space: pre-wrap; } <translation>Đóng lại</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>Trung bình</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>Nhỏ nhất</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>Tối đa</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation type="unfinished"/> </message> @@ -4178,12 +4365,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4197,12 +4384,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>Số bắt đầu mới</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4210,12 +4397,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4294,12 +4481,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4349,6 +4536,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4372,7 +4673,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> <translation type="unfinished"/> </message> </context> @@ -4427,7 +4728,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -4443,11 +4744,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4457,7 +4753,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4507,53 +4803,73 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> <translation type="unfinished"/> </message> </context> @@ -4574,63 +4890,73 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> + <location filename="../qt-ui/usersurvey.ui" line="14"/> + <source>User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="14"/> - <source>User Survey</source> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> <message> @@ -4800,12 +5126,19 @@ OS CPU Architecture: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4813,70 +5146,70 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -4891,13 +5224,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4908,16 +5241,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4943,120 +5276,120 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) hoặc (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>không khí</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>được tích hợp</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>dây ràng</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>mắt cá chân</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>cân nặng giáp che</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>Thất bại khi đọc dữ liệu '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -5075,7 +5408,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5089,7 +5422,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>đường dốc</translation> @@ -5136,7 +5469,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5292,42 +5625,42 @@ Maximum</source> <translation>Lỗi khi chuyển thông số các mẫu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Sự kiện: đang đợi thao tác từ người dùng</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>mô hình=%u (0x%08x), firmware=%u (0x%08x), số hiệu=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>Lỗi khi đăng ký quản lý sự kiện.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>Lỗi khi đăng ký việc hủy bỏ quản lý.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>Lỗi khi nhập dữ liệu lặn</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>Không thể tạo nội dung cho thiết bị đo lặn</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation>Không thể mở %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5346,432 +5679,474 @@ Maximum</source> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>Thất bại khi truy vấn việc nhận_sự kiện từ cơ sở dữ liệu. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>Thất bại khi kết nối cơ sở dữ liệu '%s'. -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>Thất bại khi truy vấn dữ liệu '%s'. -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. +</source> + <translation>Thất bại khi kết nối cơ sở dữ liệu '%s'. +</translation> + </message> + <message> + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. +</source> + <translation>Thất bại khi truy vấn dữ liệu '%s'. +</translation> + </message> + <message> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>Quá nhiều dưỡng khí được trộn</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation type="unfinished"/> </message> @@ -5936,97 +6311,97 @@ EADD: %d%s <translation>(không có cuộc lặn nào)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>CN</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>T2</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>T3</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>T4</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>T5</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>T6</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>T7</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>Th1</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>Th2</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>Th3</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>Th5</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>Th6</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>Th7</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>Th8</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>Th9</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>Th10</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>Th11</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>Th12</translation> </message> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index 84f411570..777d5e137 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="535"/> + <location filename="../qt-ui/simplewidgets.cpp" line="539"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="536"/> + <location filename="../qt-ui/simplewidgets.cpp" line="540"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -24,32 +24,32 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../configuredivecomputer.cpp" line="227"/> + <location filename="../configuredivecomputer.cpp" line="210"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="243"/> + <location filename="../configuredivecomputer.cpp" line="226"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="561"/> + <location filename="../configuredivecomputer.cpp" line="542"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="570"/> + <location filename="../configuredivecomputer.cpp" line="551"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="579"/> + <location filename="../configuredivecomputer.cpp" line="560"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputer.cpp" line="588"/> + <location filename="../configuredivecomputer.cpp" line="569"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> @@ -847,70 +847,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="916"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="941"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="923"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="927"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="915"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="940"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="945"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="953"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="954"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="965"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="966"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1069,22 +1069,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Model</source> <translation>型號</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Device ID</source> <translation>裝置 ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1608"/> + <location filename="../qt-ui/models.cpp" line="1610"/> <source>Nickname</source> <translation>別名</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Clicking here will remove this dive computer.</source> <translation>點擊這裡移除此潛水電腦。</translation> </message> @@ -1092,18 +1092,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> <source>Bailing out to OC</source> <translation>跳脫至 OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="123"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/> <source> begin</source> <comment>Starts with space!</comment> <translation>開始</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="124"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/> <source> end</source> <comment>Starts with space!</comment> <translation>結束</translation> @@ -1112,97 +1112,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Date</source> <translation>日期</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Rating</source> <translation>評分</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1249"/> + <location filename="../qt-ui/models.cpp" line="1251"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1252"/> + <location filename="../qt-ui/models.cpp" line="1254"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1257"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1258"/> + <location filename="../qt-ui/models.cpp" line="1260"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1261"/> + <location filename="../qt-ui/models.cpp" line="1263"/> <source>Suit</source> <translation>防寒衣</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1264"/> + <location filename="../qt-ui/models.cpp" line="1266"/> <source>Cyl</source> <translation>氣瓶</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1269"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1272"/> + <location filename="../qt-ui/models.cpp" line="1274"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1275"/> + <location filename="../qt-ui/models.cpp" line="1277"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1278"/> + <location filename="../qt-ui/models.cpp" line="1280"/> <source>Max CNS</source> <translation>最大 CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1281"/> + <location filename="../qt-ui/models.cpp" line="1283"/> <source>Location</source> <translation>位置</translation> </message> @@ -1210,87 +1210,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="785"/> + <location filename="../qt-ui/divelistview.cpp" line="787"/> <source>Expand all</source> <translation>全部展開</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="786"/> + <location filename="../qt-ui/divelistview.cpp" line="788"/> <source>Collapse all</source> <translation>全部摺疊</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="787"/> + <location filename="../qt-ui/divelistview.cpp" line="789"/> <source>Collapse others</source> <translation>摺疊其它</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="789"/> + <location filename="../qt-ui/divelistview.cpp" line="791"/> <source>Remove dive(s) from trip</source> <translation>從旅程中移除潛水記錄(多支)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="790"/> + <location filename="../qt-ui/divelistview.cpp" line="792"/> <source>Create new trip above</source> <translation>設定為新的旅程</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Add dive(s) to trip immediately above</source> <translation>於上方增加潛水記錄(多支)至旅程中</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="806"/> + <location filename="../qt-ui/divelistview.cpp" line="808"/> <source>Add dive(s) to trip immediately below</source> <translation>於下方增加潛水記錄(多支)至旅程中</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="810"/> + <location filename="../qt-ui/divelistview.cpp" line="812"/> <source>Merge trip with trip above</source> <translation>與上方旅程合併</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="811"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Merge trip with trip below</source> <translation>與下方旅程合併</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="815"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Delete dive(s)</source> <translation>刪除潛水記錄(多支)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="817"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Mark dive(s) invalid</source> <translation>標示為無效的潛水記錄(多支)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="821"/> + <location filename="../qt-ui/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>合併所選擇的潛水記錄</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="823"/> + <location filename="../qt-ui/divelistview.cpp" line="825"/> <source>Renumber dive(s)</source> <translation>為潛水記錄(多支)重新編號</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="824"/> + <location filename="../qt-ui/divelistview.cpp" line="826"/> <source>Shift times</source> <translation>移動時間</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="825"/> + <location filename="../qt-ui/divelistview.cpp" line="827"/> <source>Load images</source> <translation>載入影像</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Open image files</source> <translation>開啟影像檔</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="846"/> + <location filename="../qt-ui/divelistview.cpp" line="850"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>影像檔案 (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1298,54 +1298,49 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="105"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> <source>Export format</source> <translation>匯出格式</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="117"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="88"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="136"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="149"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="120"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="169"/> - <source>CSV</source> - <translation>CSV</translation> - </message> - <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="179"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="160"/> <source>Worldmap</source> <translation>世界地圖</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="76"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="210"/> <source>Selection</source> <translation>選擇</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="85"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="231"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="219"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>Selected dives</source> <translation>選擇的潛水</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="95"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="260"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> <source>All dives</source> <translation>所有潛水</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="277"/> <source>HTML</source> <translation>HTML</translation> </message> @@ -1360,107 +1355,133 @@ <translation>一般匯出</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="130"/> <source>DiveShare</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="140"/> + <source>CSV dive profile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="150"/> + <source>CSV dive details</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="170"/> <source>Image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="248"/> + <source>CSV units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="261"/> + <source>Metric</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="266"/> + <source>Imperial</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> <source>General settings</source> <translation>一般設定</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="215"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="289"/> <source>Subsurface numbers</source> <translation>Subsurface numbers</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="318"/> <source>Export yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Export list only</source> <translation>只匯出清單</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="283"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="357"/> <source>Style options</source> <translation>樣式選項</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="369"/> <source>Font</source> <translation>字型</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="379"/> <source>Font size</source> <translation>字型大小</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="316"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="390"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="321"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="395"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="326"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="400"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="331"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="405"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="336"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="410"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="341"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="415"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="346"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="420"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="354"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="428"/> <source>Theme</source> <translation>主題</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="439"/> <source>Light</source> <translation>Light</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="444"/> <source>Sand</source> <translation>Sand</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="270"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF 檔案 (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="274"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV 檔案 (*.csv *.CSV)</translation> </message> @@ -1471,77 +1492,83 @@ </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/> - <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation>逗號分隔數值,並包含相對應潛水剖面的資訊。</translation> + <source>Comma separated values describing the dive profile.</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/> + <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to divelogs.de website.</source> <translation>傳送潛水資料至 divelogs.de 網站。</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> <source>Send the dive data to dive-share.appspot.com website</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>匯出潛點位置至 HTML,並繪製於地圖上。</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Subsurface native XML format.</source> <translation>Subsurface 原生 XML 格式</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/> <source>Export UDDF file as</source> <translation>匯出 UDDF 檔案為</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="273"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/> <source>Export CSV file as</source> <translation>匯出 CSV 檔案為</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> <source>Export world map</source> <translation>匯出地圖</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="281"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="301"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/> <source>HTML files (*.html)</source> <translation>HTML 檔案 (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="285"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/> <source>Export Subsurface XML</source> <translation>匯出 Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML 檔案 (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/> <source>Export HTML files as</source> <translation>匯出 HTML 檔案為</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="347"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/> <source>Can't open file %s</source> <translation>無法開啟檔案 %s</translation> </message> @@ -1580,7 +1607,7 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="176"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="437"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="466"/> <source>Time</source> <translation>時間</translation> </message> @@ -1606,25 +1633,25 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="58"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="789"/> <source>Field separator</source> <translation>欄位分隔</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="588"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> <source>Units</source> <translation>單位</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="42"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="595"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="370"/> <source>Metric</source> <translation>公制</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="47"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="600"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="375"/> <source>Imperial</source> <translation>英制</translation> </message> @@ -1639,100 +1666,160 @@ <translation>手動潛水</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="322"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="316"/> <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="319"/> <source>Date format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="338"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="332"/> <source>dd.mm.yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="343"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="337"/> <source>mm/dd/yyyy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="348"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="342"/> <source>yyyy-mm-dd</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="363"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="392"/> <source>Dive #</source> <translation>潛水號#</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="397"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="410"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="426"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="439"/> <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="400"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="429"/> <source>Date</source> <translation>日期</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="471"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="484"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="500"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="513"/> <source>Dive duration in seconds or in min:sec format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="474"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="503"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="545"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="574"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="562"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="591"/> <source>Tags</source> <translation>標籤</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="511"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="608"/> + <source>Cyl size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="625"/> + <source>Air temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="642"/> + <source>Start Pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="659"/> + <source>Water temp</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="676"/> + <source>End Press</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="693"/> + <source>O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="710"/> + <source>He</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="742"/> + <source>Choose duration format.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="745"/> + <source>Duration format</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="758"/> + <source>Seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="763"/> + <source>Minutes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="768"/> + <source>Minutes:seconds</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.ui" line="540"/> <source>Location</source> <translation>位置</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="380"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="409"/> <source>Max depth</source> <translation>最大深度</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="83"/> - <location filename="../qt-ui/divelogimportdialog.ui" line="357"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="386"/> <source>Field configuration</source> <translation>欄位設定</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="420"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="449"/> <source>Mean depth</source> <translation>平均深度</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="454"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="483"/> <source>Buddy</source> <translation>潛伴</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="494"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="523"/> <source>Notes</source> <translation>記錄</translation> </message> <message> - <location filename="../qt-ui/divelogimportdialog.ui" line="528"/> + <location filename="../qt-ui/divelogimportdialog.ui" line="557"/> <source>Weight</source> <translation>重量</translation> </message> @@ -1844,77 +1931,92 @@ <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>Depth</source> <translation>深度</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Time</source> <translation>時間</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> <source>Pressure</source> <translation>壓力</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> <source>Temperature</source> <translation>溫度</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> <source>Color</source> <translation>顔色</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> <source>Pressure S</source> <translation>壓力S</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/> + <source>Heart Beat</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/> + <source>Gradient Factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/> + <source>Mean Depth/s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> <source>Pressure I</source> <translation>壓力I</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> <source>User entered</source> <translation>使用者輸入</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/> <source>Cylinder index</source> <translation>氣瓶編號</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> <source>Ceiling</source> <translation>上限深度</translation> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/> <source>SAC</source> <translation>耗氣率</translation> </message> @@ -1965,127 +2067,127 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Date</source> <translation>日期</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> - <location filename="../qt-ui/models.cpp" line="1487"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Rating</source> <translation>評分</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>Depth</source> <translation>深度</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Temp</source> <translation>溫度</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1453"/> + <location filename="../qt-ui/models.cpp" line="1455"/> <source>Weight</source> <translation>重量</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1465"/> + <location filename="../qt-ui/models.cpp" line="1467"/> <source>SAC</source> <translation>耗氣率</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1456"/> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1458"/> + <location filename="../qt-ui/models.cpp" line="1504"/> <source>Suit</source> <translation>防寒衣</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1459"/> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1461"/> + <location filename="../qt-ui/models.cpp" line="1507"/> <source>Cyl</source> <translation>氣瓶</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1462"/> - <location filename="../qt-ui/models.cpp" line="1508"/> + <location filename="../qt-ui/models.cpp" line="1464"/> + <location filename="../qt-ui/models.cpp" line="1510"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1513"/> + <location filename="../qt-ui/models.cpp" line="1515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1471"/> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1473"/> + <location filename="../qt-ui/models.cpp" line="1521"/> <source>Max CNS</source> <translation>最大 CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1474"/> - <location filename="../qt-ui/models.cpp" line="1522"/> + <location filename="../qt-ui/models.cpp" line="1476"/> + <location filename="../qt-ui/models.cpp" line="1524"/> <source>Location</source> <translation>位置</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1490"/> + <location filename="../qt-ui/models.cpp" line="1492"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1493"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1495"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1496"/> + <location filename="../qt-ui/models.cpp" line="1498"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1499"/> + <location filename="../qt-ui/models.cpp" line="1501"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1468"/> - <location filename="../qt-ui/models.cpp" line="1516"/> + <location filename="../qt-ui/models.cpp" line="1470"/> + <location filename="../qt-ui/models.cpp" line="1518"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> @@ -2189,54 +2291,54 @@ <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/> <source>OK</source> <translation>確認</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/> <source>Error</source> <translation>錯誤</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/> <source>Retry</source> <translation>重試</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/> <source>Find Uemis dive computer</source> <translation>搜索Uemis潛水設備</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/> <source>Choose file for divecomputer download logfile</source> <translation>選擇記錄檔供潛水電腦下載日誌檔</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/> <source>Log files (*.log)</source> <translation>記錄檔 (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/> <source>Warning</source> <translation>提醒</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>儲存潛水電腦傾印資訊並不會下載潛水記錄</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/> <source>Choose file for divecomputer binary dump file</source> <translation>選擇檔案供潛水電腦記錄傾印資訊</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/> <source>Dump files (*.bin)</source> <translation>傾印檔 (*bin)</translation> </message> @@ -2309,17 +2411,42 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2278"/> + <location filename="../qt-ui/models.cpp" line="2280"/> <source>Value</source> <translation type="unfinished"/> </message> </context> <context> + <name>FacebookManager</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="244"/> + <source>Photo Upload Sucessfull</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="245"/> + <source>Your dive profile was updated to facebook.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="249"/> + <source>Photo Upload Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="250"/> + <source>Your dive profile was not updated to facebook, + please send the following to the developer. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2358,17 +2485,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1399"/> + <location filename="../configuredivecomputerthreads.cpp" line="1544"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1402"/> + <location filename="../configuredivecomputerthreads.cpp" line="1547"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1406"/> + <location filename="../configuredivecomputerthreads.cpp" line="1550"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2376,7 +2503,7 @@ <context> <name>GlobeGPS</name> <message> - <location filename="../qt-ui/globe.cpp" line="120"/> + <location filename="../qt-ui/globe.cpp" line="128"/> <source>Edit selected dive locations</source> <translation>編輯所選擇的潛水位置</translation> </message> @@ -2384,7 +2511,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="561"/> + <location filename="../qt-ui/simplewidgets.cpp" line="566"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2400,330 +2527,330 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="477"/> + <location filename="../qt-ui/maintab.ui" line="133"/> + <location filename="../qt-ui/maintab.cpp" line="489"/> <source>Location</source> <translation>位置</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="63"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation>座標</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Divemaster</source> <translation>導潛</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="148"/> + <location filename="../qt-ui/maintab.ui" line="154"/> <source>Buddy</source> <translation>潛伴</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="222"/> <source>Tags</source> <translation>標籤</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="223"/> + <location filename="../qt-ui/maintab.ui" line="186"/> <source>Rating</source> <translation>評分</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="236"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> <translation>能見度</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="127"/> + <location filename="../qt-ui/maintab.ui" line="208"/> <source>Suit</source> <translation>防寒衣</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="452"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Dive notes</source> <translation>潛水筆記</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="72"/> - <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="265"/> + <location filename="../qt-ui/maintab.ui" line="73"/> + <location filename="../qt-ui/maintab.ui" line="648"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp.</source> <translation>氣溫</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="79"/> - <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="266"/> + <location filename="../qt-ui/maintab.ui" line="80"/> + <location filename="../qt-ui/maintab.ui" line="667"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp.</source> <translation>水溫</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.ui" line="229"/> + <location filename="../qt-ui/maintab.cpp" line="490"/> <source>Notes</source> <translation>記錄</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="317"/> + <location filename="../qt-ui/maintab.ui" line="369"/> <source>Equipment</source> <translation>裝備</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="480"/> + <location filename="../qt-ui/maintab.ui" line="496"/> <source>Gases used</source> <translation>消耗氣體</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="499"/> + <location filename="../qt-ui/maintab.ui" line="515"/> <source>Gas consumed</source> <translation>氣體消耗</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="537"/> + <location filename="../qt-ui/maintab.ui" line="553"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="575"/> + <location filename="../qt-ui/maintab.ui" line="591"/> <source>Max. depth</source> <translation>最大深度</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="613"/> + <location filename="../qt-ui/maintab.ui" line="629"/> <source>Air pressure</source> <translation>氣壓</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="670"/> + <location filename="../qt-ui/maintab.ui" line="686"/> <source>Dive time</source> <translation>潛水時間</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="841"/> + <location filename="../qt-ui/maintab.ui" line="845"/> <source>Total time</source> <translation>全部時間</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="899"/> + <location filename="../qt-ui/maintab.ui" line="903"/> <source>Gas consumption</source> <translation>氣體消耗</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="958"/> + <location filename="../qt-ui/maintab.ui" line="962"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="964"/> + <location filename="../qt-ui/maintab.ui" line="968"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> - <location filename="../qt-ui/maintab.ui" line="442"/> + <location filename="../qt-ui/maintab.ui" line="54"/> + <location filename="../qt-ui/maintab.ui" line="458"/> <source>Date</source> <translation>日期</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="275"/> + <location filename="../qt-ui/maintab.ui" line="61"/> <source>Time</source> <translation>時間</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="397"/> + <location filename="../qt-ui/maintab.ui" line="425"/> <source>Dive info</source> <translation>潛水資訊</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="461"/> + <location filename="../qt-ui/maintab.ui" line="477"/> <source>Interval</source> <translation>水面休息時間</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="518"/> - <location filename="../qt-ui/maintab.ui" line="795"/> + <location filename="../qt-ui/maintab.ui" line="534"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <source>SAC</source> <translation>耗氣率</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="594"/> + <location filename="../qt-ui/maintab.ui" line="610"/> <source>Avg. depth</source> <translation>平均深度</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="556"/> + <location filename="../qt-ui/maintab.ui" line="572"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="689"/> + <location filename="../qt-ui/maintab.ui" line="705"/> <source>Salinity</source> <translation>鹽度</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="726"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <source>Stats</source> <translation>統計</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="775"/> <source>Depth</source> <translation>深度</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="783"/> + <location filename="../qt-ui/maintab.ui" line="787"/> <source>Temperature</source> <translation>溫度</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="813"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="860"/> + <location filename="../qt-ui/maintab.ui" line="864"/> <source>Dives</source> <translation>潛水</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="944"/> + <location filename="../qt-ui/maintab.ui" line="948"/> <source>Photos</source> <translation>照片</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Cylinders</source> <translation>氣瓶</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="98"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Weights</source> <translation>配重</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="54"/> + <location filename="../qt-ui/maintab.cpp" line="55"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="58"/> + <location filename="../qt-ui/maintab.cpp" line="59"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="96"/> <source>Add cylinder</source> <translation>新增氣瓶</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="99"/> + <location filename="../qt-ui/maintab.cpp" line="100"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="262"/> + <location filename="../qt-ui/maintab.cpp" line="274"/> <source>Air temp. [%1]</source> <translation>氣溫 [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="263"/> + <location filename="../qt-ui/maintab.cpp" line="275"/> <source>Water temp. [%1]</source> <translation>水溫 [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="300"/> + <location filename="../qt-ui/maintab.cpp" line="312"/> <source>This trip is being edited.</source> <translation>此旅程已被編輯.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> <source>Multiple dives are being edited.</source> <translation>此些旅程已被編輯.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="309"/> + <location filename="../qt-ui/maintab.cpp" line="321"/> <source>This dive is being edited.</source> <translation>此潛水已被編輯.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="423"/> - <location filename="../qt-ui/maintab.cpp" line="447"/> + <location filename="../qt-ui/maintab.cpp" line="435"/> + <location filename="../qt-ui/maintab.cpp" line="459"/> <source>Trip notes</source> <translation>旅程筆記</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="445"/> + <location filename="../qt-ui/maintab.cpp" line="457"/> <source>Trip location</source> <translation>旅程位置</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="513"/> - <location filename="../qt-ui/maintab.cpp" line="545"/> - <location filename="../qt-ui/maintab.cpp" line="549"/> - <location filename="../qt-ui/maintab.cpp" line="553"/> + <location filename="../qt-ui/maintab.cpp" line="525"/> + <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="561"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="542"/> + <location filename="../qt-ui/maintab.cpp" line="554"/> <source>Deepest dive</source> <translation>最深的潛水</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="543"/> + <location filename="../qt-ui/maintab.cpp" line="555"/> <source>Shallowest dive</source> <translation>最淺的潛水</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="556"/> + <location filename="../qt-ui/maintab.cpp" line="568"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="557"/> + <location filename="../qt-ui/maintab.cpp" line="569"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="558"/> + <location filename="../qt-ui/maintab.cpp" line="570"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="569"/> + <location filename="../qt-ui/maintab.cpp" line="581"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="570"/> + <location filename="../qt-ui/maintab.cpp" line="582"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="583"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="581"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="582"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="583"/> + <location filename="../qt-ui/maintab.cpp" line="595"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="607"/> + <location filename="../qt-ui/maintab.cpp" line="619"/> <source>These gases could be mixed from Air and using: </source> @@ -2732,17 +2859,17 @@ mixed from Air and using: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="611"/> + <location filename="../qt-ui/maintab.cpp" line="623"/> <source> and </source> <translation>與</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="895"/> + <location filename="../qt-ui/maintab.cpp" line="907"/> <source>Discard the changes?</source> <translation>取消變更?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="896"/> + <location filename="../qt-ui/maintab.cpp" line="908"/> <source>You are about to discard your changes.</source> <translation>您將要放棄您的變更。</translation> </message> @@ -2750,92 +2877,92 @@ mixed from Air and using: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="257"/> + <location filename="../qt-ui/mainwindow.ui" line="203"/> <source>&File</source> <translation>檔案</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="627"/> + <location filename="../qt-ui/mainwindow.ui" line="574"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="682"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <source>Toggle pHe graph</source> <translation>切換 pHe 圖表</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <source>Toggle calculating all tissues</source> <translation>切換計算所有的組織</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <source>Toggle DC reported ceiling</source> <translation>切換 DC 回報的上限深度</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="706"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <source>Toggle calculated ceiling</source> <translation>切換計算的上限深度</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="778"/> + <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Toggle NDL, TTS</source> <translation>切換 NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="677"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>切換以每次增加 3m 計算的上限深度</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="635"/> + <location filename="../qt-ui/mainwindow.ui" line="582"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="646"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source>Re-plan &dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="742"/> + <location filename="../qt-ui/mainwindow.ui" line="689"/> <source>Toggle heart rate</source> <translation>切換心跳率</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <source>Toggle MOD</source> <translation>切換 MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="766"/> + <location filename="../qt-ui/mainwindow.ui" line="713"/> <source>Toggle EAD, END, EADD</source> <translation>切換 EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="790"/> + <location filename="../qt-ui/mainwindow.ui" line="737"/> <source>Toggle SAC rate</source> <translation>切換 SAC 率</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="802"/> + <location filename="../qt-ui/mainwindow.ui" line="749"/> <source>Toggle ruler</source> <translation>切換規則</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="178"/> + <location filename="../qt-ui/mainwindow.ui" line="124"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">潛水計畫細節</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="140"/> <source>Print</source> <translation>列印</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="227"/> + <location filename="../qt-ui/mainwindow.ui" line="173"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -2848,486 +2975,491 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="226"/> <source>&Log</source> <translation>日誌</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <source>&View</source> <translation>檢視</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <source>&Help</source> <translation>幫助</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Import</source> <translation>匯入</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="282"/> <source>&New logbook</source> <translation>建立新日誌</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="285"/> <source>New</source> <translation>建立</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="288"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="293"/> <source>&Open logbook</source> <translation>開啟日誌</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="217"/> + <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.cpp" line="245"/> <source>Open</source> <translation>開啟</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="299"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="304"/> <source>&Save</source> <translation>儲存</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="307"/> <source>Save</source> <translation>儲存</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="363"/> + <location filename="../qt-ui/mainwindow.ui" line="310"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="368"/> + <location filename="../qt-ui/mainwindow.ui" line="315"/> <source>Sa&ve as</source> <translation>另存為</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="371"/> + <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Save as</source> <translation>另存為</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="374"/> + <location filename="../qt-ui/mainwindow.ui" line="321"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="379"/> + <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>&Close</source> <translation>關閉</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="382"/> + <location filename="../qt-ui/mainwindow.ui" line="329"/> <source>Close</source> <translation>關閉</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="385"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="398"/> + <location filename="../qt-ui/mainwindow.ui" line="345"/> <source>P&references</source> <translation>設置</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <source>Import &GPS data from Subsurface web service</source> <translation>自 Subsurface 網路服務匯入 GPS 資料</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>Ctrl+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="457"/> + <location filename="../qt-ui/mainwindow.ui" line="404"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="460"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Ctrl+V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="497"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>&Profile</source> <translation>描述</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="505"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>&Info</source> <translation>資訊</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="513"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>&All</source> <translation>全部</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="529"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>&Next DC</source> <translation>下一個 DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="537"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>&About Subsurface</source> <translation>關於 Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="553"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>&Globe</source> <translation>Globe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="575"/> + <location filename="../qt-ui/mainwindow.ui" line="522"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="580"/> + <location filename="../qt-ui/mainwindow.ui" line="527"/> <source>Import &from divelogs.de</source> <translation>自 Divelogs.de 匯入</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="588"/> + <location filename="../qt-ui/mainwindow.ui" line="535"/> <source>&Full screen</source> <translation>全螢幕</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="591"/> + <location filename="../qt-ui/mainwindow.ui" line="538"/> <source>Toggle full screen</source> <translation>切換為全螢幕</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="619"/> + <location filename="../qt-ui/mainwindow.ui" line="566"/> <source>&Check for updates</source> <translation>檢查有無更新</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="624"/> + <location filename="../qt-ui/mainwindow.ui" line="571"/> <source>&Export</source> <translation>匯出</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="577"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="638"/> + <location filename="../qt-ui/mainwindow.ui" line="585"/> <source>Ctrl+Shift+C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="658"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="670"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="826"/> + <location filename="../qt-ui/mainwindow.ui" line="773"/> <source>Toggle pictures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="838"/> + <location filename="../qt-ui/mainwindow.ui" line="785"/> <source>Toggle tank bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="846"/> + <location filename="../qt-ui/mainwindow.ui" line="793"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="861"/> + <location filename="../qt-ui/mainwindow.ui" line="808"/> <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="813"/> + <source>User &survey</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="796"/> <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="390"/> + <location filename="../qt-ui/mainwindow.ui" line="337"/> <source>&Print</source> <translation>列印</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <source>&Quit</source> <translation>結束</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="367"/> <source>Import from &dive computer</source> <translation>從潛水電腦匯入</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="431"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="465"/> + <location filename="../qt-ui/mainwindow.ui" line="412"/> <source>&Renumber</source> <translation>重新編號</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="468"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="484"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="564"/> + <location filename="../qt-ui/mainwindow.ui" line="511"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="423"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <source>&Edit device names</source> <translation>編輯裝置名稱</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <source>&Add dive</source> <translation>新增潛水</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="476"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Auto &group</source> <translation>自動群組</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="481"/> + <location filename="../qt-ui/mainwindow.ui" line="428"/> <source>&Yearly statistics</source> <translation>年統計</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="489"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>&Dive list</source> <translation>潛水列表</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="492"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="500"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="508"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="516"/> + <location filename="../qt-ui/mainwindow.ui" line="463"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="521"/> + <location filename="../qt-ui/mainwindow.ui" line="468"/> <source>P&revious DC</source> <translation>上一個 DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="524"/> + <location filename="../qt-ui/mainwindow.ui" line="471"/> <source>Left</source> <translation>左邊</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="532"/> + <location filename="../qt-ui/mainwindow.ui" line="479"/> <source>Right</source> <translation>右邊</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="545"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>User &manual</source> <translation>使用者說明</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="548"/> + <location filename="../qt-ui/mainwindow.ui" line="495"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="556"/> + <location filename="../qt-ui/mainwindow.ui" line="503"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="561"/> + <location filename="../qt-ui/mainwindow.ui" line="508"/> <source>P&lan dive</source> <translation>計畫潛水</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="569"/> + <location filename="../qt-ui/mainwindow.ui" line="516"/> <source>&Import log files</source> <translation>匯入日誌檔案</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="572"/> + <location filename="../qt-ui/mainwindow.ui" line="519"/> <source>Import divelog files from other applications</source> <translation>從其他程序導入潛水檔案文件</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="541"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="242"/> <source>Open file</source> <translation>開啟檔案</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="218"/> + <location filename="../qt-ui/mainwindow.cpp" line="246"/> <source>Cancel</source> <translation>取消</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="322"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>在關閉檔案前, 請儲存或取消此次潛水的編輯.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>在新增潛水前, 請先儲存或取消此次潛水的編輯.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="481"/> <source>Print runtime table</source> <translation>列印操作表格</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="824"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>您是否要對檔案 %1 所做的修改儲存?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="779"/> + <location filename="../qt-ui/mainwindow.cpp" line="826"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>您是否要對資料檔案所做的修改進行儲存?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="784"/> + <location filename="../qt-ui/mainwindow.cpp" line="831"/> <source>Save changes?</source> <translation>儲存變更?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1134"/> + <location filename="../qt-ui/mainwindow.cpp" line="1186"/> <source>Save file as</source> <translation>另存新檔</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1275"/> + <location filename="../qt-ui/mainwindow.cpp" line="1327"/> <source>Open dive log file</source> <translation>打開潛水日誌檔案</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1276"/> - <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="785"/> + <location filename="../qt-ui/mainwindow.cpp" line="832"/> <source>Changes will be lost if you don't save them.</source> <translation>如果不進行儲存, 所做變更將會遺失.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="262"/> - <location filename="../qt-ui/mainwindow.cpp" line="397"/> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="434"/> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Warning</source> <translation>提醒</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="208"/> - <location filename="../qt-ui/mainwindow.cpp" line="1118"/> + <location filename="../qt-ui/mainwindow.cpp" line="236"/> + <location filename="../qt-ui/mainwindow.cpp" line="1170"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>在開啟新檔前, 請儲存或取消此次潛水的編輯.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="578"/> + <location filename="../qt-ui/mainwindow.cpp" line="615"/> <source>Yearly statistics</source> <translation>年統計</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1135"/> + <location filename="../qt-ui/mainwindow.cpp" line="1187"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1328"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1368"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>請在嘗試其他編輯時先完成當前編輯</translation> </message> @@ -3335,12 +3467,52 @@ p, li { white-space: pre-wrap; } <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="645"/> + <location filename="../qt-ui/simplewidgets.cpp" line="651"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> </context> <context> + <name>OstcFirmwareCheck</name> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/> + <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/> + <source> + +Please start bluetooth on your OSTC Sport and do the same perparations as for a loogbook download before continuing with the update</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/> + <source>Not now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <source>Update firmware</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <source>Firmware upgrade notice</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> + <source>Save the downloaded firmware as</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/> + <source>HEX files (*.hex)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="486"/> @@ -3398,387 +3570,402 @@ p, li { white-space: pre-wrap; } <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="83"/> + <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> <translation>預設值</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="93"/> + <location filename="../qt-ui/preferences.ui" line="95"/> <source>Units</source> <translation>單位</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="103"/> + <location filename="../qt-ui/preferences.ui" line="105"/> <source>Graph</source> <translation>圖表</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="113"/> + <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> <translation>語言</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="123"/> + <location filename="../qt-ui/preferences.ui" line="125"/> <source>Network</source> <translation>網路</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="155"/> + <location filename="../qt-ui/preferences.ui" line="135"/> + <source>Facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="167"/> <source>Font</source> <translation>字型</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="165"/> + <location filename="../qt-ui/preferences.ui" line="177"/> <source>Font size</source> <translation>字體大小</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="178"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <source>Dives</source> <translation>潛水</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="196"/> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>Use default</source> <translation>使用預設</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="206"/> + <location filename="../qt-ui/preferences.ui" line="218"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="255"/> + <location filename="../qt-ui/preferences.ui" line="267"/> <source>Animations</source> <translation>動畫演示</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="261"/> + <location filename="../qt-ui/preferences.ui" line="273"/> <source>Speed</source> <translation>速度</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="314"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Clear all settings</source> <translation>清除所有設定</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="320"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <source>Reset all settings to their default value</source> <translation>使用預設值重置所有設定</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="349"/> + <location filename="../qt-ui/preferences.ui" line="361"/> <source>System</source> <translation>系統</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="356"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Metric</source> <translation>公制</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="366"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Imperial</source> <translation>英制</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="376"/> + <location filename="../qt-ui/preferences.ui" line="388"/> <source>Personalize</source> <translation>個人化</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="400"/> + <location filename="../qt-ui/preferences.ui" line="412"/> <source>Depth</source> <translation>深度</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="407"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="417"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>feet</source> <translation>feet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="434"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="444"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="461"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>liter</source> <translation>liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="471"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="488"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>celsius</source> <translation>攝氏</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="498"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>fahrenheit</source> <translation>華氏</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="515"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="804"/> <source>System default</source> <translation>系統預設</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="831"/> + <location filename="../qt-ui/preferences.ui" line="843"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="837"/> + <location filename="../qt-ui/preferences.ui" line="849"/> <source>Proxy type</source> <translation>Proxy 種類</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="850"/> + <location filename="../qt-ui/preferences.ui" line="862"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="876"/> + <location filename="../qt-ui/preferences.ui" line="888"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="914"/> <source>Requires authentication</source> <translation>需要認證</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="922"/> + <location filename="../qt-ui/preferences.ui" line="934"/> <source>Username</source> <translation>使用者名稱</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="945"/> + <location filename="../qt-ui/preferences.ui" line="957"/> <source>Password</source> <translation>密碼</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="812"/> + <location filename="../qt-ui/preferences.ui" line="985"/> + <source>about:blank</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1011"/> + <source>Disconnect from facebook</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="824"/> <source>Filter</source> <translation>篩選器</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="427"/> + <location filename="../qt-ui/preferences.ui" line="439"/> <source>Pressure</source> <translation>壓力</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="149"/> + <location filename="../qt-ui/preferences.ui" line="161"/> <source>Lists and tables</source> <translation>列表與表單</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="184"/> + <location filename="../qt-ui/preferences.ui" line="196"/> <source>Default dive log file</source> <translation>預設潛水日誌檔案</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="215"/> + <location filename="../qt-ui/preferences.ui" line="227"/> <source>Display invalid</source> <translation>顯示無效</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="232"/> + <location filename="../qt-ui/preferences.ui" line="244"/> <source>Default cylinder</source> <translation>預設氣瓶</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="238"/> + <location filename="../qt-ui/preferences.ui" line="250"/> <source>Use default cylinder</source> <translation>使用的預設氣瓶</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="288"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <source>Subsurface web service</source> <translation>Subsurface 網路服務</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="294"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Default user ID</source> <translation>預設的使用者 ID</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="304"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Save user ID locally?</source> <translation>是否儲存使用者 ID 於本機?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="454"/> + <location filename="../qt-ui/preferences.ui" line="466"/> <source>Volume</source> <translation>容量</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="481"/> + <location filename="../qt-ui/preferences.ui" line="493"/> <source>Temperature</source> <translation>溫度</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="520"/> <source>Weight</source> <translation>重量</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="525"/> + <location filename="../qt-ui/preferences.ui" line="537"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="540"/> + <location filename="../qt-ui/preferences.ui" line="552"/> <source>Time units</source> <translation>時間單位</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="553"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Minutes</source> <translation>分</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="563"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <source>Seconds</source> <translation>秒</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="607"/> <source>Show</source> <translation>顯示</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="776"/> + <location filename="../qt-ui/preferences.ui" line="788"/> <source>GFLow at max depth</source> <translation>最大深度的 GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="736"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <source>Misc</source> <translation>其它</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="12"/> + <location filename="../qt-ui/preferences.ui" line="14"/> <source>Preferences</source> <translation>環境設定</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="546"/> + <location filename="../qt-ui/preferences.ui" line="558"/> <source>Ascent/descent speed denominator</source> <translation>上升/下降速度分母</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="606"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>Threshold when showing pO₂</source> <translation>顯示 pO₂ 時的臨界值</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="630"/> + <location filename="../qt-ui/preferences.ui" line="642"/> <source>Threshold when showing pN₂</source> <translation>顯示 pN₂ 時的臨界值</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Threshold when showing pHe</source> <translation>顯示 pHe 時的臨界值</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="678"/> + <location filename="../qt-ui/preferences.ui" line="690"/> <source>Max pO₂ when showing MOD</source> <translation>顯示 MOD 時最大的 pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="702"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Draw dive computer reported ceiling red</source> <translation>畫出潛水設備回報的警戒上限深度</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="713"/> + <location filename="../qt-ui/preferences.ui" line="725"/> <source>Show unused cylinders in Equipment tab</source> <translation>在裝備分頁中顯示未使用的氣瓶</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="724"/> + <location filename="../qt-ui/preferences.ui" line="736"/> <source>Show average depth</source> <translation>顯示平均深度</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="742"/> + <location filename="../qt-ui/preferences.ui" line="754"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="759"/> + <location filename="../qt-ui/preferences.ui" line="771"/> <source>GFHigh</source> <translation>GFhigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="23"/> + <location filename="../qt-ui/preferences.cpp" line="28"/> <source>No proxy</source> <translation>無 proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="24"/> + <location filename="../qt-ui/preferences.cpp" line="29"/> <source>System proxy</source> <translation>系統 proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="25"/> + <location filename="../qt-ui/preferences.cpp" line="30"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="26"/> + <location filename="../qt-ui/preferences.cpp" line="31"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="260"/> + <location filename="../qt-ui/preferences.cpp" line="291"/> <source>Restart required</source> <translation>需要重新啟動</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="261"/> + <location filename="../qt-ui/preferences.cpp" line="292"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>您必須重新啟動 Subsurface 來正確載入新的語言。</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="425"/> + <location filename="../qt-ui/preferences.cpp" line="456"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>若按下 OK ,則所有 Subsurface 設定將立即被重設回預設值。</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="411"/> + <location filename="../qt-ui/preferences.cpp" line="442"/> <source>Open default log file</source> <translation>開啟預設的日誌檔案</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="424"/> + <location filename="../qt-ui/preferences.cpp" line="455"/> <source>Warning</source> <translation>提醒</translation> </message> @@ -3905,72 +4092,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2095"/> <source>unknown</source> <translation>未知</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2098"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Dive #%1 - %2</source> <translation>潛水 #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2101"/> + <location filename="../qt-ui/models.cpp" line="2103"/> <source>Max depth: %1 %2</source> <translation>最大深度: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2108"/> + <location filename="../qt-ui/models.cpp" line="2110"/> <source>Duration: %1 min</source> <translation>區間: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2115"/> <source>Gas used:</source> <translation>消耗氣體: </translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2117"/> <source>Tags:</source> <translation>標籤:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2117"/> + <location filename="../qt-ui/models.cpp" line="2119"/> <source>SAC:</source> <translation>耗氣率: </translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2119"/> + <location filename="../qt-ui/models.cpp" line="2121"/> <source>Weights:</source> <translation>配重:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2124"/> + <location filename="../qt-ui/models.cpp" line="2126"/> <source>Notes:</source> <translation>記錄:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2131"/> + <location filename="../qt-ui/models.cpp" line="2133"/> <source>Divemaster:</source> <translation>導潛:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2133"/> + <location filename="../qt-ui/models.cpp" line="2135"/> <source>Buddy:</source> <translation>潛伴:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2135"/> + <location filename="../qt-ui/models.cpp" line="2137"/> <source>Suit:</source> <translation>防寒衣:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2137"/> + <location filename="../qt-ui/models.cpp" line="2139"/> <source>Viz:</source> <translation>能見度:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2139"/> + <location filename="../qt-ui/models.cpp" line="2141"/> <source>Rating:</source> <translation>評分:</translation> </message> @@ -3978,103 +4165,103 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="588"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="605"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1104"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/> <source>Make first divecomputer</source> <translation>設定第 1 潛水電腦</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1106"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/> <source>Delete this divecomputer</source> <translation>刪除此潛水電腦</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1120"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/> <source>Add gas change</source> <translation>增加氣瓶交換</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1123"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1131"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/> <source>Add set-point change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1133"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/> <source>Add bookmark</source> <translation>新增書籤</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1137"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/> <source>Remove event</source> <translation>移除事件</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1142"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/> <source>Hide similar events</source> <translation>隱藏相似事件</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1149"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/> <source>Edit name</source> <translation>潛水名稱</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1178"/> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1185"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1200"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/> <source>Unhide all events</source> <translation>取消隱藏所有事件</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide events</source> <translation>隱藏事件</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/> <source>Hide all %1 events?</source> <translation>隱藏所有 %1 事件?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/> <source>Remove the selected event?</source> <translation>移除所選擇的事件?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1270"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1360"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/> <source>Edit name of bookmark</source> <translation>編輯書籤名稱</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1361"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/> <source>Custom name:</source> <translation>自訂名稱:</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -4102,22 +4289,22 @@ p, li { white-space: pre-wrap; } <translation>關閉</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="42"/> <source>Average</source> <translation>平均</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="37"/> + <location filename="../qt-ui/simplewidgets.cpp" line="45"/> <source>Minimum</source> <translation>最低</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="40"/> + <location filename="../qt-ui/simplewidgets.cpp" line="48"/> <source>Maximum</source> <translation>最高</translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="289"/> + <location filename="../qt-ui/globe.cpp" line="297"/> <source>Move the map and double-click to set the dive location</source> <translation>在地圖上移動, 並且雙擊來設定潛水位置</translation> </message> @@ -4185,12 +4372,12 @@ p, li { white-space: pre-wrap; } <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="816"/> + <location filename="../configuredivecomputerthreads.cpp" line="1450"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="807"/> + <location filename="../configuredivecomputerthreads.cpp" line="1442"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4204,12 +4391,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="143"/> + <location filename="../qt-ui/simplewidgets.cpp" line="151"/> <source>New starting number</source> <translation>新的開始編號</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="141"/> + <location filename="../qt-ui/simplewidgets.cpp" line="149"/> <source>New number</source> <translation>新編號</translation> </message> @@ -4217,12 +4404,12 @@ p, li { white-space: pre-wrap; } <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1432"/> + <location filename="../configuredivecomputerthreads.cpp" line="1575"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1437"/> + <location filename="../configuredivecomputerthreads.cpp" line="1579"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4301,12 +4488,12 @@ p, li { white-space: pre-wrap; } <translation>哪個日期和時間將會被顯示在圖片上?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="273"/> + <location filename="../qt-ui/simplewidgets.cpp" line="276"/> <source>Open image file</source> <translation>開啟影像檔</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="275"/> + <location filename="../qt-ui/simplewidgets.cpp" line="278"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>影像檔案 (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4356,6 +4543,120 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>SocialNetworkDialog</name> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="282"/> + <source>Dive Date: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="285"/> + <source>Duration: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="286"/> + <source>h:</source> + <comment>abbreviation for hours plus separator</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="287"/> + <source>min</source> + <comment>abbreviation for minutes</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="290"/> + <source>Dive Location: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="293"/> + <source>Buddy: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="296"/> + <source>Divemaster: %1 +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworks.cpp" line="299"/> + <source> +%1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SocialnetworksDialog</name> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/> + <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/> + <source>Album</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/> + <source>The profile picture will be posted in this album (required)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/> + <source>Include</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/> + <source>Date and time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/> + <source>Duration</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/> + <source>Location</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/> + <source>Divemaster</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/> + <source>Notes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/> + <source>Facebook post preview</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SubsurfaceAbout</name> <message> <location filename="../qt-ui/about.ui" line="23"/> @@ -4379,8 +4680,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/about.cpp" line="13"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>跨平台潛水日誌軟體<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> + <translation type="unfinished"/> </message> </context> <context> @@ -4434,7 +4735,7 @@ p, li { white-space: pre-wrap; } <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="586"/> + <location filename="../qt-ui/simplewidgets.cpp" line="592"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -4450,11 +4751,6 @@ p, li { white-space: pre-wrap; } <context> <name>TableView</name> <message> - <location filename="../qt-ui/tableview.cpp" line="55"/> - <source>Add cylinder</source> - <translation>新增氣瓶</translation> - </message> - <message> <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> @@ -4464,7 +4760,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="510"/> + <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4514,54 +4810,74 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="39"/> + <location filename="../qt-ui/updatemanager.cpp" line="65"/> <source>Check for updates.</source> <translation>檢查有無更新。</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="40"/> + <location filename="../qt-ui/updatemanager.cpp" line="66"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface 無法確認更新。</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="45"/> + <location filename="../qt-ui/updatemanager.cpp" line="71"/> <source>The following error occurred:</source> <translation>錯誤持續發生:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="46"/> + <location filename="../qt-ui/updatemanager.cpp" line="72"/> <source>Please check your internet connection.</source> <translation>請確認您的網路連線。</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="85"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="61"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="68"/> + <location filename="../qt-ui/updatemanager.cpp" line="96"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="97"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="75"/> + <location filename="../qt-ui/updatemanager.cpp" line="104"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="76"/> - <source>There was an error while trying to check for updates.<br/><br/>%1</source> - <translation>嘗試確認更新發生錯誤。<br/><br/>%1</translation> + <location filename="../qt-ui/updatemanager.cpp" line="105"/> + <source>The server returned the following information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <source>Decline</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="124"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/updatemanager.cpp" line="126"/> + <source>Automatic check for updates</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4581,64 +4897,74 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="32"/> - <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> - <translation>我們想要從使用者的角度來學習,認識他們的設定與他們的使用習慣。請花 1 分鐘的時間,協助我們填寫此表格,並傳送至 Subsurface 團隊。請回覆所有提供給您的選項。</translation> - </message> - <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> <translation>使用者調查</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="25"/> - <source>Subsurface user survey</source> - <translation>Subsurface 使用者調查</translation> + <location filename="../qt-ui/usersurvey.ui" line="31"/> + <source>Subsurface User Survey</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="52"/> - <source>Recreational diver</source> - <translation>休閒潛水潛水員</translation> + <location filename="../qt-ui/usersurvey.ui" line="44"/> + <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="45"/> - <source>Technical diver</source> - <translation>技術潛水潛水員</translation> + <location filename="../qt-ui/usersurvey.ui" line="63"/> + <source>Technical Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="59"/> - <source>Interested in dive planning</source> - <translation>有興趣於潛水計畫</translation> + <location filename="../qt-ui/usersurvey.ui" line="76"/> + <source>Recreational Diver</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="66"/> - <source>I am downloading dives from supported dive computer</source> - <translation>我從支援的潛水電腦下載潛水記錄</translation> + <location filename="../qt-ui/usersurvey.ui" line="89"/> + <source>Dive Planner</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="73"/> - <source>I am importing dives from other software / sources</source> - <translation>我自別的軟體 / 來源,匯入潛水記錄</translation> + <location filename="../qt-ui/usersurvey.ui" line="102"/> + <source>Supported Dive Computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="80"/> - <source>I am manually entering dives</source> - <translation>我手動輸入潛水記錄</translation> + <location filename="../qt-ui/usersurvey.ui" line="115"/> + <source>Other software/sources</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="128"/> + <source>Manually entering dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="141"/> + <source>Android Companion App</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="87"/> - <source>I use the Android companion app to track dive locations</source> - <translation>我使用 Android app 來追蹤潛水位置</translation> + <location filename="../qt-ui/usersurvey.ui" line="154"/> + <source>Any Suggestions? (In English)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="94"/> - <source>Please type suggestions (in English) in the following box</source> - <translation>請於下方欄位留下任何建議 (英文)</translation> + <location filename="../qt-ui/usersurvey.ui" line="177"/> + <source>The following information about your system will also be submitted.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="104"/> - <source>The following information about your system will also be submitted</source> - <translation>以下有關您的系統的資訊將會被傳送。</translation> + <location filename="../qt-ui/usersurvey.ui" line="225"/> + <source>What kind of diver are you?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/usersurvey.ui" line="264"/> + <source>Where are you importing data from?</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="42"/> @@ -4811,12 +5137,19 @@ OS CPU 架構: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1357"/> + <location filename="../configuredivecomputerthreads.cpp" line="1479"/> + <location filename="../configuredivecomputerthreads.cpp" line="1487"/> + <location filename="../configuredivecomputerthreads.cpp" line="1497"/> + <source>Failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../configuredivecomputerthreads.cpp" line="1506"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1362"/> + <location filename="../configuredivecomputerthreads.cpp" line="1510"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4824,79 +5157,79 @@ OS CPU 架構: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> + <location filename="../qt-ui/models.cpp" line="1841"/> <source>Year > Month / Trip</source> <translation>年 > 月 / 旅程</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1844"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1845"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>Duration Total</source> <translation>區間 全部</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1848"/> + <location filename="../qt-ui/models.cpp" line="1850"/> <source> Average</source> <translation> 平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1853"/> <source> Shortest</source> <translation> 最短</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source> Longest</source> <translation> 最長</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source>Depth (%1) Average</source> <translation>深度 (%1) 平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1860"/> - <location filename="../qt-ui/models.cpp" line="1869"/> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1862"/> + <location filename="../qt-ui/models.cpp" line="1871"/> + <location filename="../qt-ui/models.cpp" line="1880"/> <source> Minimum</source> <translation> 最小</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1863"/> - <location filename="../qt-ui/models.cpp" line="1872"/> - <location filename="../qt-ui/models.cpp" line="1881"/> + <location filename="../qt-ui/models.cpp" line="1865"/> + <location filename="../qt-ui/models.cpp" line="1874"/> + <location filename="../qt-ui/models.cpp" line="1883"/> <source> Maximum</source> <translation> 最大</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1866"/> + <location filename="../qt-ui/models.cpp" line="1868"/> <source>SAC (%1) Average</source> <translation>耗氣率 (%1) 平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1875"/> + <location filename="../qt-ui/models.cpp" line="1877"/> <source>Temp. (%1) Average</source> <translation>溫度 (%1) @@ -4912,13 +5245,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="191"/> - <location filename="../qt-gui.cpp" line="338"/> + <location filename="../qt-gui.cpp" line="340"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="195"/> - <location filename="../qt-gui.cpp" line="341"/> + <location filename="../qt-gui.cpp" line="343"/> <source>psi</source> <translation>psi</translation> </message> @@ -4929,16 +5262,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="274"/> - <location filename="../qt-gui.cpp" line="220"/> - <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="237"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="279"/> - <location filename="../qt-gui.cpp" line="223"/> - <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="225"/> + <location filename="../qt-gui.cpp" line="239"/> <source>ft</source> <translation>ft</translation> </message> @@ -4964,120 +5297,120 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="330"/> - <location filename="../qt-gui.cpp" line="246"/> - <location filename="../qt-gui.cpp" line="256"/> + <location filename="../qt-gui.cpp" line="248"/> + <location filename="../qt-gui.cpp" line="258"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="334"/> - <location filename="../qt-gui.cpp" line="244"/> - <location filename="../qt-gui.cpp" line="254"/> + <location filename="../qt-gui.cpp" line="246"/> + <location filename="../qt-gui.cpp" line="256"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1480"/> + <location filename="../dive.c" line="1503"/> <source>(%s) or (%s)</source> <translation>(%s) 或 (%s)</translation> </message> <message> <location filename="../divelist.c" line="464"/> - <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1059"/> - <location filename="../planner.c" line="1062"/> + <location filename="../equipment.c" line="81"/> + <location filename="../planner.c" line="1060"/> + <location filename="../planner.c" line="1063"/> <source>air</source> <translation>air</translation> </message> <message> - <location filename="../equipment.c" line="190"/> + <location filename="../equipment.c" line="192"/> <source>integrated</source> <translation>整合型</translation> </message> <message> - <location filename="../equipment.c" line="191"/> + <location filename="../equipment.c" line="193"/> <source>belt</source> <translation>配重帶</translation> </message> <message> - <location filename="../equipment.c" line="192"/> + <location filename="../equipment.c" line="194"/> <source>ankle</source> <translation>腳踝</translation> </message> <message> - <location filename="../equipment.c" line="193"/> + <location filename="../equipment.c" line="195"/> <source>backplate weight</source> <translation>背板配重</translation> </message> <message> - <location filename="../equipment.c" line="194"/> + <location filename="../equipment.c" line="196"/> <source>clip-on</source> <translation>吊掛式</translation> </message> <message> <location filename="../file.c" line="112"/> - <location filename="../file.c" line="425"/> - <location filename="../file.c" line="488"/> - <location filename="../file.c" line="900"/> + <location filename="../file.c" line="434"/> + <location filename="../file.c" line="506"/> + <location filename="../file.c" line="917"/> <source>Failed to read '%s'</source> <translation>無法讀取 '%s'</translation> </message> <message> - <location filename="../file.c" line="368"/> + <location filename="../file.c" line="377"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="582"/> + <location filename="../file.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="611"/> + <location filename="../file.c" line="629"/> <source>Mouth piece position OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="615"/> + <location filename="../file.c" line="633"/> <source>Mouth piece position CC</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="619"/> + <location filename="../file.c" line="637"/> <source>Mouth piece position unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="623"/> + <location filename="../file.c" line="641"/> <source>Mouth piece position not connected</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="629"/> + <location filename="../file.c" line="647"/> <source>Power off</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="689"/> + <location filename="../file.c" line="707"/> <source>O₂ calibration failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="691"/> - <location filename="../file.c" line="700"/> + <location filename="../file.c" line="709"/> + <location filename="../file.c" line="718"/> <source>O₂ calibration</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="768"/> + <location filename="../file.c" line="785"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="852"/> - <location filename="../file.c" line="892"/> - <location filename="../file.c" line="982"/> + <location filename="../file.c" line="869"/> + <location filename="../file.c" line="909"/> + <location filename="../file.c" line="1007"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>CSV 匯入最大支援 %d 欄位.</translation> </message> @@ -5096,7 +5429,7 @@ Maximum</source> </message> <message> <location filename="../cochran.c" line="338"/> - <location filename="../file.c" line="635"/> + <location filename="../file.c" line="653"/> <source>battery</source> <translation type="unfinished"/> </message> @@ -5110,7 +5443,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../file.c" line="657"/> + <location filename="../file.c" line="675"/> <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>上升</translation> @@ -5157,7 +5490,7 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../file.c" line="749"/> + <location filename="../file.c" line="766"/> <location filename="../libdivecomputer.c" line="122"/> <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> @@ -5313,42 +5646,42 @@ Maximum</source> <translation>樣本解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="707"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>事件: 等待使用者動作</translation> </message> <message> - <location filename="../libdivecomputer.c" line="715"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>型號=%u (0x%08x), 韌體=%u (0x%08x), 序號=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="778"/> <source>Error registering the event handler.</source> <translation>錯誤的註冊程序.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="792"/> + <location filename="../libdivecomputer.c" line="783"/> <source>Error registering the cancellation handler.</source> <translation>錯誤的註冊取消程序.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="813"/> + <location filename="../libdivecomputer.c" line="804"/> <source>Dive data import error</source> <translation>匯入潛水資料錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="852"/> + <location filename="../libdivecomputer.c" line="843"/> <source>Unable to create libdivecomputer context</source> <translation>無法建立 libdivecomputer 上下文</translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="850"/> <source>Unable to open %s %s (%s)</source> <translation> 無法開啟 %s %s (%s)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="866"/> + <location filename="../libdivecomputer.c" line="858"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> @@ -5367,221 +5700,254 @@ Maximum</source> <message> <location filename="../parse-xml.c" line="1989"/> <location filename="../parse-xml.c" line="2137"/> - <source>Database query get_events failed. + <source>Database query dm4_events failed. </source> - <translation>資料庫讀取 get_events 失敗. -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../parse-xml.c" line="1996"/> <location filename="../parse-xml.c" line="2144"/> - <source>Database query get_tags failed. + <source>Database query dm4_tags failed. </source> - <translation>數據庫請求get_tags失敗</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="173"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="2318"/> + <source>Database query shearwater_cylinders failed. </source> - <translation>資料庫連結錯誤 '%s' . -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2168"/> - <location filename="../parse-xml.c" line="2189"/> - <location filename="../parse-xml.c" line="2338"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="2325"/> + <source>Database query shearwater_changes failed. </source> - <translation>資料庫要求錯誤 '%s' . -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2302"/> - <source>Database query get_cylinders failed. + <location filename="../parse-xml.c" line="2332"/> + <source>Database query shearwater_profile_sample failed. </source> - <translation>資料庫讀取 get_cylinders 失敗。 -</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2451"/> + <source>Database query cobalt_cylinders failed. +</source> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2309"/> - <source>Database query get_changes failed. + <location filename="../parse-xml.c" line="2458"/> + <source>Database query cobalt_buddies failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2465"/> + <source>Database query cobalt_visibility failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2472"/> + <source>Database query cobalt_location failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2479"/> + <source>Database query cobalt_location (site) failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../parse-xml.c" line="2486"/> + <source>Database query cobalt_profile_sample failed. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../file.c" line="174"/> + <source>Database connection failed '%s'. </source> - <translation>資料庫讀取 get_changes 失敗。 + <translation>資料庫連結錯誤 '%s' . </translation> </message> <message> - <location filename="../parse-xml.c" line="2316"/> - <source>Database query get_profile_sample failed. + <location filename="../parse-xml.c" line="2168"/> + <location filename="../parse-xml.c" line="2189"/> + <location filename="../parse-xml.c" line="2508"/> + <location filename="../parse-xml.c" line="2527"/> + <source>Database query failed '%s'. </source> - <translation>資料庫讀取 get_profile_sample 失敗。 + <translation>資料庫要求錯誤 '%s' . </translation> </message> <message> - <location filename="../parse-xml.c" line="2407"/> + <location filename="../parse-xml.c" line="2848"/> <source>Can't open stylesheet %s</source> <translation>無法開啟樣式 %s</translation> </message> <message> - <location filename="../equipment.c" line="81"/> + <location filename="../equipment.c" line="83"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="819"/> + <location filename="../planner.c" line="820"/> <source>Can't find gas %s</source> <translation>無法找到氣體 %s</translation> </message> <message> - <location filename="../planner.c" line="355"/> + <location filename="../planner.c" line="356"/> <source>Too many gas mixes</source> <translation>太多氣體混合</translation> </message> <message> - <location filename="../planner.c" line="532"/> + <location filename="../planner.c" line="533"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="541"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>以 GFlow = %d 與 GFhigh = %d 為基礎</translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="544"/> <source>Subsurface dive plan</source> <translation>Subsurface 潛水計畫</translation> </message> <message> - <location filename="../planner.c" line="547"/> + <location filename="../planner.c" line="548"/> <source>depth</source> <translation>深度</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="551"/> <source>runtime</source> <translation>作業時間</translation> </message> <message> - <location filename="../planner.c" line="553"/> + <location filename="../planner.c" line="554"/> <source>duration</source> <translation>時間</translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="557"/> <source>gas</source> <translation>氣體</translation> </message> <message> - <location filename="../planner.c" line="593"/> + <location filename="../planner.c" line="594"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="602"/> <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="../planner.c" line="614"/> + <location filename="../planner.c" line="615"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="621"/> + <location filename="../planner.c" line="622"/> <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="../planner.c" line="634"/> + <location filename="../planner.c" line="635"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="637"/> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="650"/> + <location filename="../planner.c" line="651"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="676"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="678"/> <source>Switch gas to %s</source> <translation>更換氣體至 %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="697"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="698"/> + <location filename="../planner.c" line="699"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../planner.c" line="702"/> + <location filename="../planner.c" line="703"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="704"/> + <location filename="../planner.c" line="705"/> <source>Gas consumption:</source> <translation>氣體消耗:</translation> </message> <message> - <location filename="../planner.c" line="534"/> - <location filename="../planner.c" line="724"/> - <location filename="../planner.c" line="729"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="753"/> <source>Warning:</source> <translation>提醒:</translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="523"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="725"/> + <location filename="../planner.c" line="726"/> <source>this is more gas than available in the specified cylinder!</source> <translation>指定的氣瓶氣體超過供給量!</translation> </message> <message> - <location filename="../planner.c" line="730"/> + <location filename="../planner.c" line="731"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>無足夠的預留氣體可供上升使用!</translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="733"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s 在計畫上升中)</translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="735"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s 在計畫上升期間) of %s</translation> </message> <message> - <location filename="../planner.c" line="749"/> + <location filename="../planner.c" line="750"/> <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="../planner.c" line="1063"/> + <location filename="../planner.c" line="1064"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1099"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5590,63 +5956,63 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1094"/> + <location filename="../profile.c" line="1102"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1106"/> <source>T: %.1f%s </source> <translation>T: %.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1104"/> + <location filename="../profile.c" line="1112"/> <source>V: %.1f%s </source> <translation>V: %.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1107"/> + <location filename="../profile.c" line="1115"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1109"/> + <location filename="../profile.c" line="1117"/> <source>CNS: %u%% </source> <translation>CNS: %u%%</translation> </message> <message> - <location filename="../profile.c" line="1111"/> + <location filename="../profile.c" line="1119"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar</translation> </message> <message> - <location filename="../profile.c" line="1113"/> + <location filename="../profile.c" line="1121"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar</translation> </message> <message> - <location filename="../profile.c" line="1115"/> + <location filename="../profile.c" line="1123"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar</translation> </message> <message> - <location filename="../profile.c" line="1118"/> + <location filename="../profile.c" line="1126"/> <source>MOD: %d%s </source> <translation>MOD: %d%s</translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1133"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5655,7 +6021,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1137"/> <source>END: %d%s EADD: %d%s </source> @@ -5664,162 +6030,168 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1141"/> + <location filename="../profile.c" line="1149"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>安全停留: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1152"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>安全停留: 未知時間 @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1149"/> + <location filename="../profile.c" line="1157"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1152"/> + <location filename="../profile.c" line="1160"/> <source>Deco: unkn time @ %.0f%s </source> <translation>減壓: 未知時間 @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1156"/> + <location filename="../profile.c" line="1164"/> <source>In deco </source> <translation>減壓中 </translation> </message> <message> - <location filename="../profile.c" line="1158"/> + <location filename="../profile.c" line="1166"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1161"/> + <location filename="../profile.c" line="1169"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1172"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>減壓: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1172"/> + <location filename="../profile.c" line="1180"/> <source>In deco (calc) </source> <translation>減壓 (計算) </translation> </message> <message> - <location filename="../profile.c" line="1174"/> + <location filename="../profile.c" line="1182"/> <source>NDL: %umin (calc) </source> <translation>NDL:%umin (預計) </translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1185"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1180"/> + <location filename="../profile.c" line="1188"/> <source>Calculated ceiling %.0f%s </source> <translation>計算的上限深度 %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1186"/> + <location filename="../profile.c" line="1194"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>組織 %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1192"/> + <location filename="../profile.c" line="1200"/> <source>heartbeat: %d </source> <translation>心跳: %d </translation> </message> <message> - <location filename="../profile.c" line="1194"/> + <location filename="../profile.c" line="1202"/> <source>bearing: %d </source> <translation>方位: %d </translation> </message> <message> - <location filename="../profile.c" line="1287"/> + <location filename="../profile.c" line="1205"/> + <source>mean depth to here %.1f%s +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile.c" line="1300"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1291"/> - <location filename="../profile.c" line="1295"/> - <location filename="../profile.c" line="1299"/> + <location filename="../profile.c" line="1304"/> + <location filename="../profile.c" line="1308"/> + <location filename="../profile.c" line="1312"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1303"/> + <location filename="../profile.c" line="1316"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1307"/> + <location filename="../profile.c" line="1320"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1311"/> - <location filename="../profile.c" line="1315"/> + <location filename="../profile.c" line="1324"/> + <location filename="../profile.c" line="1328"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1322"/> + <location filename="../profile.c" line="1335"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="296"/> + <location filename="../qt-gui.cpp" line="298"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="299"/> + <location filename="../qt-gui.cpp" line="301"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="442"/> + <location filename="../qt-gui.cpp" line="460"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 潛水)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="447"/> + <location filename="../qt-gui.cpp" line="465"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 潛水)</translation> </message> @@ -5984,97 +6356,97 @@ EADD: %d%s <translation>(無潛水)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sun</source> <translation>周日</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mon</source> <translation>周一</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Tue</source> <translation>周二</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Wed</source> <translation>周三</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Thu</source> <translation>周四</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Fri</source> <translation>周五</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="83"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Sat</source> <translation>周六</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jan</source> <translation>1月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Feb</source> <translation>2月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Mar</source> <translation>3月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Apr</source> <translation>4月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>May</source> <translation>5月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="92"/> + <location filename="../subsurfacestartup.c" line="97"/> <source>Jun</source> <translation>6月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Jul</source> <translation>7月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Aug</source> <translation>8月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Sep</source> <translation>9月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Oct</source> <translation>10月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Nov</source> <translation>11月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="93"/> + <location filename="../subsurfacestartup.c" line="98"/> <source>Dec</source> <translation>12月</translation> </message> |