Pull in translations so far

The commit shows me as author - but of course the actual work was done by
all the translators. This is one of the things where the effort to give
correct credit just doesn't appear to be worth it.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

19 files changed, 11626 insertions, 49378 deletions

diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index e93361a93..17d2ccbf2 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -1,2389 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="bg_BG">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-Няма събития
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete"> &gt; Месец</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete"> Изтегли</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete"> Моля изберете леководолазен компютър и устройство. </translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> начало</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> край</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">№</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/мин</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s от %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$s, %2$s, %4$d, %5$d   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d %2$s %4$d   %5$dh%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s, %3$d %2$s, %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %3$d %2$s, %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d мин</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dд %dч %dмин</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dч %dмин</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-таван %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Деко:%uмин @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Деко:неопр. време @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-В деко</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL:%umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-P:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Стоп:%uмин @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Стоп:неопр. време @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Subsurface планиране
-базирано на GFlow = %.0f и GFhigh = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe:%.2fбара</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s:%.2fбара</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s:%.2fбара</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s event at %d:%02u</source>
-        <translation type="obsolete">%s събитие в %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s: Response from divelogs.de</source>
-        <translation type="obsolete">%s: Отговор от divelogs.de</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) или (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(щракнете  за да редактирате време/дата)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(щракнете  за да редактирате време/дата/дълбочина)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(няма гмуркания)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(нищо)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 кб.фута/мин</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 кб.фута/мин</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 л/мин</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 гмуркания на стр.</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">2 за цял костюм</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 л/мин</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">3м увеличение за изчислен таван</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 гмуркания на стр.</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;Add segments below.
-Each line describes part of the planned dive.
-An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. &apos;+3:30&apos;) or ends at the given time (if absolute e.g &apos;@5:00&apos;, &apos;runtime&apos;), and uses the given gas.
-An empty gas means &apos;use previous gas&apos; (or AIR if no gas was specified).
-An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.
-CC SetPoint specifies CC (rebreather) dives, leave empty for OC.&lt;/small&gt;
-</source>
-        <translation type="obsolete">&lt;small&gt;Добавете сегменти долу.
-Всеки ред отговаря на част от планираното гмуркане.
-Входни данни с дълбочина, време и газ, описват сегмент, който свършва в конкретна дълбочина, отнема определено време (пр. &apos;+3:30&apos; ако e относително или &apos;@5:00&apos; ако абсолютно) и изполва конкретен газ.
-Празен газ означава &apos;използвай предния газ&apos; (или въздух).
-Входни данни с дъбочина и газ, но без време, информира системата за плануване, че газа се използва само за изкачването след като дълбочината е достигната.
-CC SetPoint означава CC (rebreather) гмуркания. Оставете празно за тип OC.&lt;/small&gt;
-</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">Въздух</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">За Subsurface</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Добави</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Добави гмуркане...</translation>
-    </message>
-    <message>
-        <source>Add bookmark event here</source>
-        <translation type="obsolete">Добави маркирано събитие тук</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Добави гмуркане</translation>
-    </message>
-    <message>
-        <source>Add gas change event here</source>
-        <translation type="obsolete">Добави събитие за промяна на газ</translation>
-    </message>
-    <message>
-        <source>Add gaschange event at %d:%02u</source>
-        <translation type="obsolete">Добави събитие за промяна на газ в %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Добави в горно пътуване</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Добави контролна точка</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Атмосф. налягане</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Темп. на въздух</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Tемп. на въздуха в %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Винаги предпочитай изтегленото гмуркане</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">Апр</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">Авг</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Автоматично групиране</translation>
-    </message>
-    <message>
-        <source>Available gases</source>
-        <translation type="obsolete">Достъпни газове</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Средно</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Средно</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Средно</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Средно</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Средна дълбочина</translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Средна дълбочина (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">Средно SAC</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Средна темп.</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Средно време</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Връщане към OC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">Бара</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Партньор</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CC SetPoint</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Не може да бъде намерен газ %d/%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">Не може да бъде зареден стилов файл (%s)/%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Отмяна. Изпълняване на чист изход...</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Отмяна...</translation>
-    </message>
-    <message>
-        <source>Cannot add gas change</source>
-        <translation type="obsolete">Не може да се добави промяна за газ</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Не може да бъде напревен разряд!</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Целзии</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Моля изберете XML файл по подразбиране</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Моля изберете XML файлове за вмъкване</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Затвори</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Свиване на всички</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Свръзване...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Грешка при връзка: </translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Създай ново пътуване</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">Кб.Фута</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Бут.</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Бутилка</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Бутилка за плануване</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Бутилки</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">ВНИМАНИЕ: ТОВА Е НОВО ИЗПЪЛНЕНИЕ НА АГЛОРИТЪМА НА БУЛМАН И НА ПЛАНОВИКА, КОИТО НЕ СА ТЕСТВАНИ ДОСТАТЪЧНО. МОЛЯ НЕ ПЛАНУВАЙТЕ ИЗТИНСКИ ГМУРКАНИЯ БАЗИРАНИ НА ДАННИТЕ ТУК!</translation>
-    </message>
-    <message>
-        <source>Database connection failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Няма връзка към базата данни &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Грешка при заява към база данни &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query get_events failed.
-</source>
-        <translation type="obsolete">Базата данни не може да изпълни get_events.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Дата</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Дата и час</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Дата:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">Дек</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">XML файл по подразибране</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Изтрий данни за леководолазен компютър</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Изтрий гмуркане</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Изтрий гмуркания</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Дълбочина</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Надминат лимит на дълбочина</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Дълбочина:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Име на устройство</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Устройсто или входна точка</translation>
-    </message>
-    <message>
-        <source>Display invalid dives</source>
-        <translation type="obsolete">Покажи невалидни гмуркания</translation>
-    </message>
-    <message>
-        <source>Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</source>
-        <extracomment>++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-&lt;trailing text&gt;
-</extracomment>
-        <translation type="obsolete">Гмуркане #%1$d - %2$s %3$02d/%4$02d/%5$04d в %6$d:%7$02d %8$s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Гмуркане №%d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Гмуркане №%d: %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Прякор на леководолазен компютър</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Информация</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Бележки</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">ГМУРКАЧЕСКИ ПЛАНОВИК - ТОВА Е САМО СИМУЛАЦИЯ. НЕ ИЗПОЛЗВАЙТЕ ЗА ИЗТИНСКИ ГМУРКАНИЯ</translation>
-    </message>
-    <message>
-        <source>Dive Tags</source>
-        <translation type="obsolete">Тагове</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Време</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Тревога: Време за гмуркане</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Времева Информация за гмуркане</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Марка и модел на гмуркачески комютър</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Грешка при вход на данни</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Места за гмуркане</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Водач</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Гмуркането започва кога?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Гмуркане №</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Шрифт за списъка на гмуркания</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Водач</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Гмуркания</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Местонахождения</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Изтегли от леководолазен компютър</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Изтегли от леководолазен компютър...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Изтегли от уеб услугата</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Изтегли от уеб услуга...</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Успешно изтегляне!</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Продълж. (мин.)</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Продълж. (мин.)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">И</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Редактирай</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Редактирай имена на устройства</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Редактирай прякори на гмуркачерски комютри</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Редактиране на информация за пътуване</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Редактиране на обобщение за пътуване</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Редактирайте прякора на гмуркачески комютър като кликнете два пъти върху съответното поле</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Редактиране на гмуркане</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Редактирай дата/време на гмуркане</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Редактирай гмуркания</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Редактиране на гмуркания</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Редактиране на обобщение за пътуване</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Включване / изключване на събития</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Tags</source>
-        <translation type="obsolete">Включи / Изключи Тагове</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Край</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Мин. дълбочина</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Въведете потребителски ключ и натиснете &apos;Изтегли&apos;. След като е готово може да натиснете &apos;Прилагане&apos; ако желаете на приложите промените.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Екипировка</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Грешка</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Грешка при прием на водна соленост</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Грешка при разряд на дата и час</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Грешка при рaзряд на време за гмуркане</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Грешка при рaзряд на газ микс</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Грешка при рaзряд на газ микс брой</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Грешка при рaзряд на максимална дълбочина</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Грешка при рaзряд на стойности</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Грешка при регистриране на направление за отменяне</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Грешка при регистриране на данни</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Грешка при регистриране на направление за събития</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Събитие: systime=%&lt;PRId64&gt;, devtime=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Събитие: изчаквание на действие от потребителя</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Разшири всички</translation>
-    </message>
-    <message>
-        <source>Export As UDDF File</source>
-        <translation type="obsolete">Експорт като UDDF файл</translation>
-    </message>
-    <message>
-        <source>Export UDDF...</source>
-        <translation type="obsolete">Експорт на UDDF...</translation>
-    </message>
-    <message>
-        <source>Export dive(s) to UDDF</source>
-        <translation type="obsolete">Експортирай гмурканe (гмуркания) като UDDF</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Фаренхайт</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Не могат да бъдат отворени %i файла</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Не може да бъде напревен разбор на &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Не може да бъде напревен разбор на &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Не може да бъде прочетен &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Не може да бъде прочетен &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">Фев</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">Фута</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Файл</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Филтър</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Изтегли всички гмуркания</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Пет</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFhigh</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFhigh за план</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFlow</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFlow за план</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (WGS84 или GPS формат)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Използван Газ</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Използван газ</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Използван Газ</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Консумация на газ:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Газ микс</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Общи настройки</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Помощ</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">Режим на готовност</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Вмъкни файл (файлове)...</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Информация</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Започни връзка</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Въведи план</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Грешна дълбочина - не може да бъде направен разряд &quot;%s&quot;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Грешна дълбочина - стойности по-големи от 400м не се поддържат</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Неправилен газ на ред %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Грешно стартово време</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Грешен потребителски ключ</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Ян</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">Юли</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">Юни</translation>
-    </message>
-    <message>
-        <source>Last stop at 20 Feet</source>
-        <translation type="obsolete">Последен стоп на 20 фута</translation>
-    </message>
-    <message>
-        <source>Last stop at 6 Meters</source>
-        <translation type="obsolete">Последен стоп на 6 метра</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Настройки на оформление</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Линус Торвалдс, Дирк Хондел и други, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Списък</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">Литра</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Местонахождение</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Регистър</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Най-дълго</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Най-дълго гмуркане</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Тревога: слаба батерия</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Внимание: слаба батерия</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Доставчик на карти</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">Март</translation>
-    </message>
-    <message>
-        <source>Mark invalid</source>
-        <translation type="obsolete">Маркирай като невалидни</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Маркирай местонахождение</translation>
-    </message>
-    <message>
-        <source>Mark valid</source>
-        <translation type="obsolete">Маркирай като валидни</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Маркер</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Водач</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Внимание: Максимално време на сигнал за декомпресия</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Макс. дълбочина</translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Макс. дълбочина (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Макс. SAC</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Макс. темп.</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Максимална дълбочина: %.*f %s
-Продължителност: %d мин
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Макс. CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Макс. налягане</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Максимум</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Максимум</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Максимум</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">Май</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Слей гмуркания</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Слей пътуване с горно пътуване</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Слей пътуване с долно пътуване</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">Метра</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Мин. дълбочина</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Мин. SAC</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Мин. темп.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Минимум</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Минимум</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Минимум</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Общи настройки</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Модел</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Пон</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Мултиплатформен, гмуркачески регистър-софтуер написан на C</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">С</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Нов</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Нов стартов номер</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Следващ ГК</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Прякор</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Няма информация за резервоар</translation>
-    </message>
-    <message>
-        <source>No cylinders listed for this dive.</source>
-        <translation type="obsolete">Няма бутилки към това гмуркане</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Бележки</translation>
-    </message>
-    <message>
-        <source>Notes height (%d%% - %d%%)</source>
-        <translation type="obsolete">Височина на бележките (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Бележки от горе</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">Нов</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">OLF</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">Окт</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Грешка върната от phread</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Пътвърди изтриване на избраното?</translation>
-    </message>
-    <message>
-        <source>Only display dives with these tags:</source>
-        <translation type="obsolete">Покажи само гмуркания с тези тагове:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Отвори файл</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Отвори...</translation>
-    </message>
-    <message>
-        <source>Ordering</source>
-        <translation type="obsolete">Подредба</translation>
-    </message>
-    <message>
-        <source>Other data height (%d%% - %d%%)</source>
-        <translation type="obsolete">Височина на други данни (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Кислород</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Тревога: покачване на парциално О2 налягане</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Внимание: покачване на парциално О2 налягане</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Внимание: парциално О2 налягане в зелената зона</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">PSI</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Парола</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Изберете на картата</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Плановик</translation>
-    </message>
-    <message>
-        <source>Please enter your userid and password for divelogs.de. The selected dives will be added to your account</source>
-        <translation type="obsolete">Моля въведете вашия потребител и парола за divelogs.de. Избраните гмуркяния ще бъдат добавени към акаунта ви.</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Настройки</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Настройки...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Налягане</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Налягане:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Предишен ГК</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">Печатай в цвят</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Напечатай само избраните гмуркания</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Напечатай селекцията</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Тип на печата</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Напечатай...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Профил</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Настройки на профила</translation>
-    </message>
-    <message>
-        <source>Profile height (%d%% - %d%%)</source>
-        <translation type="obsolete">Височина на профила (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Профил от горе</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Изход</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Тревога: оставащо газ-време</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Внимание: оставащо газ-време</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Оценка</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Четене на гмуркане %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Премахни</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Изтрий пътуване</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Изтрий гмуркане от пътуване</translation>
-    </message>
-    <message>
-        <source>Remove event here</source>
-        <translation type="obsolete">Премахни събитие тук</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Изтрий избраните гмуркания от пътуване</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Преномерирай</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Преномерирай...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Опитай пак</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">Ю</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">SAC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">SAC по време на деко. стоп</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">Добави гмуркане</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Нарушение на безопасно спиране</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Съб</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Запиши като...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Запиши промените?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Запиши файл като?</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Запиши като...</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Запиши...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Средно време</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Избери събития</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Избери събития...</translation>
-    </message>
-    <message>
-        <source>Select Tags...</source>
-        <translation type="obsolete">Избери тагове...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">Сеп</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Кратък запис в req.txt файл
-Uemis Zurich включен ли е правилно?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Най-късо</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Най-кратко гмуркане</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Покажи Колони</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">Покажи EAD, END, EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">Покажи MOD</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Покажи калкулиран таван</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Покажи докладван таван в червено</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Покажи на картата</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">Покажи pHе диаграма</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">Покажи pN%s диаграма</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">Покажи pO%s диаграма</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Симулирано гмуркане</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Големина</translation>
-    </message>
-    <message>
-        <source>Sizing heights (%% of layout)</source>
-        <translation type="obsolete">Оразмеряване на височини  (%% от оформление)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Тревога: скорост</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Внимание: скорост</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Старт</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Започни теглене</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Статистика</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Статистика %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Статистики</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Статус</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Неразпозната стойност за проценти %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Водолазен костюм</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Нед</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Време на повърхността</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Налягане на повърхността (м.бара)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Превключи газ на %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Печат на таблица</translation>
-    </message>
-    <message>
-        <source>Tags are only shown if they are identical for all edited dives</source>
-        <translation type="obsolete">Таговете се показват само ако идентични за всички гмуркания</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Предложение за смяна на резервоар</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Информация: налагане на резервоар</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">TEC настройки</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Температура</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Температура:</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Температура:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Комбиниран</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Чет</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Време</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">За да редактирате гмуркане
-щракнете два пъти върху него в гмуркаческия списък</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Превключване на зуум</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">Твърде много газови смеси</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">Твърде много контролни точки</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Общо време</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Общо време</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Тегло:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Пътуване: %1$s, %3$d %2$s, %4$d (%5$d Гмуркане)</numerusform>
-            <numerusform>Пътуване: %1$s, %3$d %2$s, %4$d (%5$d Гмуркания)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Вт</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Тип</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zurich: файловата система е почти пълна
-Излючете и свържете на ново леководолазния компютър
-и опитайте пак</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zurich: Файловата система е пълна
-Излючете/Свържете на ново леководолазния компютър
-и опитайте пак</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Uemis не може да бъде зареден</translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">Не може да бъде създаден libdivecomputer контекст</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Не може да бъде създаден разряд за %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Не може да бъдe отворен %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Единици</translation>
-    </message>
-    <message>
-        <source>Upload dive(s) to divelogs.de</source>
-        <translation type="obsolete">Качи гмуркане (гмуркания) на divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de</source>
-        <translation type="obsolete">Качи на divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de...</source>
-        <translation type="obsolete">Качи на divelogs.de...</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Маркирайте местонахождение с десния бутон на мишката</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Потребителски ключ</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Ръководство за потребителя</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Изглед</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Видимост</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Обем:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">З</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Внимание - прекалено дълги гмуркания могат да отнемат много време за калкулиране</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Внимание - плануването на прекалено дълбоки гмуркания може да отнеме много време</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Темп. на водата</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Уеб услуга</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Ср</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Тежест</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Система за тежест</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Тегло:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">XML файл</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Година</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Годишни статистики</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">Вече имате въведен ГК от този модел
-наименуван %s
-Subsurface може да поддържа прякор за това устройсто за да го различавате от вече съществуващо такова. По подразбиране това е модела и идентификатора показани долу.
-Ако не желаете да да ползате прякор натиснете &apos;Отказване&apos;.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Имате незаписани промени.
-Желаете ли да ги запишете преди затваряне на файла?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Имате незаписани промени във файла %s.
-Желаете ли да ги запишете преди затваряне на файла?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">въздух</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">време за въздух</translation>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">височина</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">глезен</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">покачване</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">нагръбна</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">бара</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">колан</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">кораб</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">бележка</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">пещера</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">каверна</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">таван</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">таван (безопасен стоп)</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">щипка</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">кб.фута</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">данни</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">деко</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">деко. стоп</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">дълбоко</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">дълбочина на спиране</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">идент. за вписване в регистъра</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">идент. за вписване на местонахождение</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">време за гмуркане</translation>
-    </message>
-    <message>
-        <source>drift</source>
-        <translation type="obsolete">дрейф</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">сух костюм</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">за вички гмуркания</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">за гмуркане №%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">за гмуркания №</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">за избраните гмуркане</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">за избраните гмуркания</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">сладководно</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">фута</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">пълен косюм</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">смяна на газ</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">посока</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">лед</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">вградена</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">невалидно</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">грешен номер на събитие</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">яке</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">кг</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">л</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">езеро</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">паунда</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">лонг джон</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">м</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">макс ppO2</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">макс CNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">макс. дълбочина</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">мембрана</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">мин</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">повече данни за гмуркане</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">повече от %d дни</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">вечер</translation>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">нон стоп време</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">няма</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">pHE праг</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">pN%s праг</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">pO%s праг</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">паскала</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">снимка</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">басейн</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">rbt</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">река</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">безопасен стоп</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">безопасен стоп (задължителен)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">безопасен стоп (свободен)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">полусух</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">бряг</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">къс</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">повърхност</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">учебно</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">внимание: ниво на тъканта</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">тренировъчно</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">Lubomir I. Ivanov</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">предавател</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">неизв.</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">неизвестно</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">неопределен</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">жилетка</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">видео</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">нарушение</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">тегло</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">мокър костюм</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">натовареност</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">останки</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="bg_BG" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Време</translation>
+        <translation>Време</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Дълбочина</translation>
+        <translation>Дълбочина</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Температура</translation>
+        <translation>Температура</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2391,57 +77,57 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Тип</translation>
+        <translation>Тип</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Големина</translation>
+        <translation>Големина</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2449,41 +135,41 @@ tranlators here
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Редактирай прякори на гмуркачерски комютри</translation>
+        <translation>Редактирай прякори на гмуркачерски комютри</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Модел</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Модел</translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Прякор</translation>
+        <translation>Прякор</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2491,12 +177,12 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2504,95 +190,87 @@ tranlators here
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Слей пътуване с горно пътуване</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Слей пътуване с долно пътуване</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2600,48 +278,48 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2649,23 +327,23 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2673,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">Въздух</translation>
+        <translation>Въздух</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Продълж. (мин.)</translation>
+        <translation>Продълж. (мин.)</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2711,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2729,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">№</translation>
+        <translation>№</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Дата</translation>
+        <translation>Дата</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">м</translation>
+        <translation>м</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">фута</translation>
+        <translation>фута</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">мин</translation>
+        <translation>мин</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">кг</translation>
+        <translation>кг</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">паунда</translation>
+        <translation>паунда</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Водолазен костюм</translation>
+        <translation>Водолазен костюм</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Бут.</translation>
+        <translation>Бут.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">макс CNS</translation>
+        <translation>макс CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Местонахождение</translation>
+        <translation>Местонахождение</translation>
     </message>
 </context>
 <context>
@@ -2798,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Грешка</translation>
+        <translation>Грешка</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Опитай пак</translation>
+        <translation>Опитай пак</translation>
     </message>
 </context>
 <context>
@@ -2816,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Изтегли от леководолазен компютър</translation>
+        <translation>Изтегли от леководолазен компютър</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Изтегли всички гмуркания</translation>
+        <translation>Изтегли всички гмуркания</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2864,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Бележки</translation>
+        <translation>Бележки</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Местонахождение</translation>
+        <translation>Местонахождение</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Водач</translation>
+        <translation>Водач</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Партньор</translation>
+        <translation>Партньор</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Оценка</translation>
+        <translation>Оценка</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Видимост</translation>
+        <translation>Видимост</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Водолазен костюм</translation>
+        <translation>Водолазен костюм</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Бележки</translation>
+        <translation>Бележки</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Екипировка</translation>
+        <translation>Екипировка</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Информация</translation>
+        <translation>Информация</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Дата</translation>
+        <translation>Дата</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Време</translation>
+        <translation>Време</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Статистики</translation>
+        <translation>Статистики</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Дълбочина</translation>
+        <translation>Дълбочина</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Температура:</translation>
+        <translation>Температура:</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Продълж. (мин.)</translation>
+        <translation>Продълж. (мин.)</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Общо време</translation>
+        <translation>Общо време</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Гмуркания</translation>
+        <translation>Гмуркания</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Бутилки</translation>
+        <translation>Бутилки</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -3091,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">неизвестно</translation>
+        <translation>неизвестно</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">С</translation>
+        <translation>С</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">Ю</translation>
+        <translation>Ю</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">И</translation>
+        <translation>И</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">З</translation>
+        <translation>З</translation>
     </message>
 </context>
 <context>
@@ -3124,417 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Файл</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Регистър</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Изглед</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Филтър</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Помощ</translation>
+        <translation>Филтър</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Нов</translation>
+        <translation>Нов</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Запиши</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Запиши като...</translation>
+        <translation>Запиши като...</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Затвори</translation>
+        <translation>Затвори</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Профил</translation>
+        <translation>Профил</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Информация</translation>
+        <translation>Информация</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Настройки</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Изход</translation>
+        <translation>Настройки</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Редактирай имена на устройства</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Преномерирай</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Превключване на зуум</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Годишни статистики</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Предишен ГК</translation>
+        <translation>Предишен ГК</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Следващ ГК</translation>
+        <translation>Следващ ГК</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Избери събития</translation>
+        <translation>Избери събития</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Въведи план</translation>
+        <translation>Въведи план</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">За Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Ръководство за потребителя</translation>
+        <translation>За Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Отвори файл</translation>
+        <translation>Отвори файл</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Запиши промените?</translation>
+        <translation>Запиши промените?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3544,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3562,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Единици</translation>
+        <translation>Единици</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Гмуркания</translation>
+        <translation>Гмуркания</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Дълбочина</translation>
+        <translation>Дълбочина</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">Метра</translation>
+        <translation>Метра</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">Фута</translation>
+        <translation>Фута</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Налягане</translation>
+        <translation>Налягане</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">Бара</translation>
+        <translation>Бара</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">Литра</translation>
+        <translation>Литра</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">Кб.Фута</translation>
+        <translation>Кб.Фута</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Температура:</translation>
+        <translation>Температура:</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Целзии</translation>
+        <translation>Целзии</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Фаренхайт</translation>
+        <translation>Фаренхайт</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Тежест</translation>
+        <translation>Тежест</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">паунда</translation>
+        <translation>паунда</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3852,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3860,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Гмуркане №</translation>
+        <translation>Гмуркане №</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Дата</translation>
+        <translation>Дата</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Дълбочина</translation>
+        <translation>Дълбочина</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Продълж. (мин.)</translation>
+        <translation>Продълж. (мин.)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Водач</translation>
+        <translation>Водач</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Партньор</translation>
+        <translation>Партньор</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Местонахождение</translation>
+        <translation>Местонахождение</translation>
     </message>
 </context>
 <context>
@@ -3898,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Напечатай само избраните гмуркания</translation>
+        <translation>Напечатай само избраните гмуркания</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">Печатай в цвят</translation>
+        <translation>Печатай в цвят</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Тип на печата</translation>
+        <translation>Тип на печата</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 гмуркания на стр.</translation>
+        <translation>6 гмуркания на стр.</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 гмуркания на стр.</translation>
+        <translation>2 гмуркания на стр.</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Печат на таблица</translation>
+        <translation>Печат на таблица</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished">Подредба</translation>
+        <translation>Подредба</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Профил от горе</translation>
+        <translation>Профил от горе</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Бележки от горе</translation>
+        <translation>Бележки от горе</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3983,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Редактирай</translation>
+        <translation>Редактирай</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">въздух</translation>
+        <translation>въздух</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Връщане към OC</translation>
+        <translation>Връщане към OC</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> начало</translation>
+        <translation> начало</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> край</translation>
+        <translation> край</translation>
     </message>
 </context>
 <context>
@@ -4071,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">неизвестно</translation>
+        <translation>неизвестно</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Бутилка</translation>
+        <translation>Бутилка</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Газ микс</translation>
+        <translation>Газ микс</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Използван Газ</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Макс. CNS</translation>
+        <translation>Макс. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4134,50 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">Въздух</translation>
+        <translation>Въздух</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Затвори</translation>
+        <translation>Затвори</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Средно</translation>
+        <translation>Средно</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished">Минимум</translation>
+        <translation>Минимум</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished">Максимум</translation>
+        <translation>Максимум</translation>
     </message>
 </context>
 <context>
@@ -4185,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Преномерирай</translation>
+        <translation>Преномерирай</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Нов стартов номер</translation>
+        <translation>Нов стартов номер</translation>
     </message>
 </context>
 <context>
@@ -4198,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4226,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">За Subsurface</translation>
+        <translation>За Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4254,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Уеб услуга</translation>
+        <translation>Уеб услуга</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Грешка при връзка: </translation>
+        <translation>Грешка при връзка: </translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Грешен потребителски ключ</translation>
+        <translation>Грешен потребителски ключ</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Не може да бъде напревен разряд!</translation>
+        <translation>Не може да бъде напревен разряд!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Успешно изтегляне!</translation>
+        <translation>Успешно изтегляне!</translation>
     </message>
 </context>
 <context>
@@ -4292,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">Бара</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>Бара</translation>
     </message>
 </context>
 <context>
@@ -4323,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">кг</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>кг</translation>
     </message>
 </context>
 <context>
@@ -4344,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Потребителски ID</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Парола</translation>
+        <translation>Парола</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4382,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Тип</translation>
+        <translation>Тип</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Тежест</translation>
+        <translation>Тежест</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4401,42 +2031,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">№</translation>
+        <translation>№</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4444,7 +2074,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4452,19 +2082,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4472,64 +2102,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">паскала</translation>
+        <translation>паскала</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">бара</translation>
+        <translation>бара</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">л</translation>
+        <translation>л</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">кб.фута</translation>
+        <translation>кб.фута</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">м</translation>
+        <translation>м</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">фута</translation>
+        <translation>фута</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">паунда</translation>
+        <translation>паунда</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">кг</translation>
+        <translation>кг</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) или (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s, %3$d %2$s, %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) или (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4539,32 +2165,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">въздух</translation>
+        <translation>въздух</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">вградена</translation>
+        <translation>вградена</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">колан</translation>
+        <translation>колан</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">глезен</translation>
+        <translation>глезен</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">нагръбна</translation>
+        <translation>нагръбна</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">щипка</translation>
+        <translation>щипка</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4574,314 +2200,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Не може да бъде прочетен &apos;%s&apos;</translation>
+        <translation>Не може да бъде прочетен &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">няма</translation>
+        <translation>няма</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">деко. стоп</translation>
+        <translation>деко. стоп</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">rbt</translation>
+        <translation>rbt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">покачване</translation>
+        <translation>покачване</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">таван</translation>
+        <translation>таван</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">натовареност</translation>
+        <translation>натовареност</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">предавател</translation>
+        <translation>предавател</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">нарушение</translation>
+        <translation>нарушение</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">бележка</translation>
+        <translation>бележка</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">повърхност</translation>
+        <translation>повърхност</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">безопасен стоп</translation>
+        <translation>безопасен стоп</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">смяна на газ</translation>
+        <translation>смяна на газ</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">безопасен стоп (свободен)</translation>
+        <translation>безопасен стоп (свободен)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">безопасен стоп (задължителен)</translation>
+        <translation>безопасен стоп (задължителен)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">дълбочина на спиране</translation>
+        <translation>дълбочина на спиране</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">таван (безопасен стоп)</translation>
+        <translation>таван (безопасен стоп)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">време за гмуркане</translation>
+        <translation>време за гмуркане</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">макс. дълбочина</translation>
+        <translation>макс. дълбочина</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">OLF</translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">време за въздух</translation>
+        <translation>време за въздух</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">посока</translation>
+        <translation>посока</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">внимание: ниво на тъканта</translation>
+        <translation>внимание: ниво на тъканта</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">нон стоп време</translation>
+        <translation>нон стоп време</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">грешен номер на събитие</translation>
+        <translation>грешен номер на събитие</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Не може да бъде създаден разряд за %s %s</translation>
+        <translation>Не може да бъде създаден разряд за %s %s</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Грешка при регистриране на данни</translation>
+        <translation>Грешка при регистриране на данни</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Грешка при разряд на дата и час</translation>
+        <translation>Грешка при разряд на дата и час</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Гмуркане №%d: %s %d %04d</translation>
+        <translation>Гмуркане №%d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Грешка при рaзряд на време за гмуркане</translation>
+        <translation>Грешка при рaзряд на време за гмуркане</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Грешка при рaзряд на максимална дълбочина</translation>
+        <translation>Грешка при рaзряд на максимална дълбочина</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Грешка при рaзряд на газ микс брой</translation>
+        <translation>Грешка при рaзряд на газ микс брой</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Грешка при прием на водна соленост</translation>
+        <translation>Грешка при прием на водна соленост</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Грешка при рaзряд на газ микс</translation>
+        <translation>Грешка при рaзряд на газ микс</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Грешка при рaзряд на стойности</translation>
+        <translation>Грешка при рaзряд на стойности</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Събитие: изчаквание на действие от потребителя</translation>
+        <translation>Събитие: изчаквание на действие от потребителя</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
+        <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Грешка при регистриране на направление за събития</translation>
+        <translation>Грешка при регистриране на направление за събития</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Грешка при регистриране на направление за отменяне</translation>
+        <translation>Грешка при регистриране на направление за отменяне</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Грешка при вход на данни</translation>
+        <translation>Грешка при вход на данни</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">Не може да бъде създаден libdivecomputer контекст</translation>
+        <translation>Не може да бъде създаден libdivecomputer контекст</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Не може да бъдe отворен %s %s (%s)</translation>
+        <translation>Не може да бъдe отворен %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Неразпозната стойност за проценти %s
+        <translation>Неразпозната стойност за проценти %s
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Не може да бъде напревен разбор на &apos;%s&apos;.
+        <translation>Не може да бъде напревен разбор на &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Не може да бъде напревен разбор на &apos;%s&apos;</translation>
+        <translation>Не може да бъде напревен разбор на &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished">Базата данни не може да изпълни get_events.
+        <translation>Базата данни не може да изпълни get_events.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished">Няма връзка към базата данни &apos;%s&apos;.
+        <translation>Няма връзка към базата данни &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished">Грешка при заява към база данни &apos;%s&apos;.
+        <translation>Грешка при заява към база данни &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">Не може да бъде зареден стилов файл (%s)/%s</translation>
+        <translation>Не може да бъде зареден стилов файл (%s)/%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Не може да бъде намерен газ %d/%d</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Бутилка за плануване</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Симулирано гмуркане</translation>
+        <translation>Не може да бъде намерен газ %d/%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">Твърде много газови смеси</translation>
+        <translation>Твърде много газови смеси</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4890,7 +2508,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Subsurface планиране
 базирано на GFlow = %.0f и GFhigh = %.0f
 
@@ -4900,166 +2518,162 @@ Subsurface планиране
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s
+        <translation>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s
+        <translation>Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Превключи газ на %s
+        <translation>Превключи газ на %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Консумация на газ:
+        <translation>Консумация на газ:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s от %s
+        <translation>%.0f%s от %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 P:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 таван %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Стоп:%uмин @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Стоп:неопр. време @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Деко:%uмин @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Деко:неопр. време @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 В деко</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s:%.2fбара</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s:%.2fбара</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe:%.2fбара</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
@@ -5068,7 +2682,7 @@ MOD:%d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 EAD:%d%s
 END:%d%s
 EADD:%d%s</translation>
@@ -5077,352 +2691,336 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">невалидно</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">кораб</translation>
+        <translation>кораб</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">бряг</translation>
+        <translation>бряг</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished">дрейф</translation>
+        <translation>дрейф</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">дълбоко</translation>
+        <translation>дълбоко</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">каверна</translation>
+        <translation>каверна</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">лед</translation>
+        <translation>лед</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">останки</translation>
+        <translation>останки</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">пещера</translation>
+        <translation>пещера</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">височина</translation>
+        <translation>височина</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">басейн</translation>
+        <translation>басейн</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">езеро</translation>
+        <translation>езеро</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">река</translation>
+        <translation>река</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">вечер</translation>
+        <translation>вечер</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">сладководно</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">тренировъчно</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">учебно</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">снимка</translation>
+        <translation>снимка</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">видео</translation>
+        <translation>видео</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">деко</translation>
+        <translation>деко</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">повече от %d дни</translation>
+        <translation>повече от %d дни</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dд %dч %dмин</translation>
+        <translation>%dд %dч %dмин</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dч %dмин</translation>
+        <translation>%dч %dмин</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">за гмуркания №</translation>
+        <translation>за гмуркания №</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">за избраните гмуркания</translation>
+        <translation>за избраните гмуркания</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">за гмуркане №%d</translation>
+        <translation>за гмуркане №%d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">за избраните гмуркане</translation>
+        <translation>за избраните гмуркане</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">за вички гмуркания</translation>
+        <translation>за вички гмуркания</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(няма гмуркания)</translation>
+        <translation>(няма гмуркания)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">Нед</translation>
+        <translation>Нед</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">Пон</translation>
+        <translation>Пон</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">Вт</translation>
+        <translation>Вт</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">Ср</translation>
+        <translation>Ср</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">Чет</translation>
+        <translation>Чет</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">Пет</translation>
+        <translation>Пет</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">Съб</translation>
+        <translation>Съб</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">Ян</translation>
+        <translation>Ян</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">Фев</translation>
+        <translation>Фев</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">Март</translation>
+        <translation>Март</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">Апр</translation>
+        <translation>Апр</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">Май</translation>
+        <translation>Май</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">Юни</translation>
+        <translation>Юни</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">Юли</translation>
+        <translation>Юли</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">Авг</translation>
+        <translation>Авг</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">Сеп</translation>
+        <translation>Сеп</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">Окт</translation>
+        <translation>Окт</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">Нов</translation>
+        <translation>Нов</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">Дек</translation>
+        <translation>Дек</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zurich: файловата система е почти пълна
+        <translation>Uemis Zurich: файловата система е почти пълна
 Излючете и свържете на ново леководолазния компютър
 и опитайте пак</translation>
     </message>
@@ -5431,7 +3029,7 @@ and click &apos;Retry&apos;</source>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zurich: Файловата система е пълна
+        <translation>Uemis Zurich: Файловата система е пълна
 Излючете/Свържете на ново леководолазния компютър
 и опитайте пак</translation>
     </message>
@@ -5439,193 +3037,193 @@ and try again</source>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Кратък запис в req.txt файл
+        <translation>Кратък запис в req.txt файл
 Uemis Zurich включен ли е правилно?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">неизвестно</translation>
+        <translation>неизвестно</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Четене на гмуркане %s %s</translation>
+        <translation>Четене на гмуркане %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">данни</translation>
+        <translation>данни</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">идент. за вписване в регистъра</translation>
+        <translation>идент. за вписване в регистъра</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">идент. за вписване на местонахождение</translation>
+        <translation>идент. за вписване на местонахождение</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">повече данни за гмуркане</translation>
+        <translation>повече данни за гмуркане</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">мокър костюм</translation>
+        <translation>мокър костюм</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">полусух</translation>
+        <translation>полусух</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">сух костюм</translation>
+        <translation>сух костюм</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">къс</translation>
+        <translation>къс</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">жилетка</translation>
+        <translation>жилетка</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">лонг джон</translation>
+        <translation>лонг джон</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">яке</translation>
+        <translation>яке</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">пълен косюм</translation>
+        <translation>пълен косюм</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">2 за цял костюм</translation>
+        <translation>2 за цял костюм</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">мембрана</translation>
+        <translation>мембрана</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Започни връзка</translation>
+        <translation>Започни връзка</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Uemis не може да бъде зареден</translation>
+        <translation>Uemis не може да бъде зареден</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Започни теглене</translation>
+        <translation>Започни теглене</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Нарушение на безопасно спиране</translation>
+        <translation>Нарушение на безопасно спиране</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Тревога: скорост</translation>
+        <translation>Тревога: скорост</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Внимание: скорост</translation>
+        <translation>Внимание: скорост</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Внимание: парциално О2 налягане в зелената зона</translation>
+        <translation>Внимание: парциално О2 налягане в зелената зона</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Внимание: покачване на парциално О2 налягане</translation>
+        <translation>Внимание: покачване на парциално О2 налягане</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Тревога: покачване на парциално О2 налягане</translation>
+        <translation>Тревога: покачване на парциално О2 налягане</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Информация: налагане на резервоар</translation>
+        <translation>Информация: налагане на резервоар</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Внимание: оставащо газ-време</translation>
+        <translation>Внимание: оставащо газ-време</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Тревога: оставащо газ-време</translation>
+        <translation>Тревога: оставащо газ-време</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Предложение за смяна на резервоар</translation>
+        <translation>Предложение за смяна на резервоар</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Надминат лимит на дълбочина</translation>
+        <translation>Надминат лимит на дълбочина</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Внимание: Максимално време на сигнал за декомпресия</translation>
+        <translation>Внимание: Максимално време на сигнал за декомпресия</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Времева Информация за гмуркане</translation>
+        <translation>Времева Информация за гмуркане</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Тревога: Време за гмуркане</translation>
+        <translation>Тревога: Време за гмуркане</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Маркер</translation>
+        <translation>Маркер</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Няма информация за резервоар</translation>
+        <translation>Няма информация за резервоар</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Внимание: слаба батерия</translation>
+        <translation>Внимание: слаба батерия</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Тревога: слаба батерия</translation>
+        <translation>Тревога: слаба батерия</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_ca_ES.ts b/translations/subsurface_ca_ES.ts
index ad61aefca..7b057fbff 100644
--- a/translations/subsurface_ca_ES.ts
+++ b/translations/subsurface_ca_ES.ts
@@ -1,77 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca_ES" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -79,57 +77,57 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -137,41 +135,41 @@
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished"></translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -179,12 +177,12 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -192,87 +190,87 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -280,48 +278,48 @@
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -329,23 +327,23 @@
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -353,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -391,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -409,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -478,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -496,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -544,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -771,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -804,377 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -1184,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1202,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1492,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1500,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1538,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1623,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1711,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1774,42 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1817,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1830,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1858,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1886,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1924,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1955,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished"></translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1976,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2014,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2033,42 +2031,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -2076,7 +2074,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -2084,19 +2082,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2104,60 +2102,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -2167,32 +2165,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -2202,301 +2200,301 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -2505,150 +2503,150 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
@@ -2656,540 +2654,540 @@ MOD:%d%s</source>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="25"/>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts
index b772c4ead..4e13b2169 100644
--- a/translations/subsurface_da_DK.ts
+++ b/translations/subsurface_da_DK.ts
@@ -1,1759 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<context>
-    <name></name>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete">Måned</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete">Download</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete">Vælg dykkercomputer og port.</translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">start</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">slut</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">#</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s of %s⏎
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$dh%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dd %dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s⏎
-CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s⏎
-Beregnet loft %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s⏎
-Deko:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s⏎
-Deko:unkn time @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s⏎
-EAD:%d%s⏎
-END:%d%s⏎
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s⏎
-In deko</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s⏎
-MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s⏎
-NDL:%umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s⏎
-P:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s⏎
-Sikkerhedsstop:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s⏎
-Sikkerhedsstop:Ukendt tid @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s⏎
-Subsurface dykkerplan⏎
-baseret på GFlow = %.0f og GFhigh = %.0f⏎
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s⏎
-T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s⏎
-pHe:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s⏎
-pN%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s⏎
-pO%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) eller (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(ingen dyk)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(tom)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 cuft/min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 cuft/min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 l/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 dyk pr side</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">2-delt heldragt</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 l/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">3m intervaller for beregnet loft</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 dyk pr side</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">LUFT</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">Om Subsurface</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Tilføj dyk...</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Tilføj dyk</translation>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Tilføj til tur over</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Tilføj waypoint</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Luft tryk</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Luft temperatur</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Luft temperatur i %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Foretræk altid downloaded dyk</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">Apr</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">Aug</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Grupér automatisk</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Gennemsnit</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Gennemsnit</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Gennemsnit</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Gennemsnit</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Gnm. dybde</translation>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">Gnm SAC</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Gnm. temperatur</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Gnm. tid</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Bailing out to OC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">Bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Makker</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CC Setpoint</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Kan ikke finde gas %d/%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Annulleret, afbryder...</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Afbrudt...</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Kan ikke fortolke svar!</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Celsius</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Vælg standard XML fil</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Vælg XML fil for import ind i den nuværende data fil</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Luk</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Skjul alle</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Forbinder...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Forbindelses fejl:</translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Opret ny tur over</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">CuFt</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Cyl</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Flaske</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Flaske for planlægning</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Flasker </translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">ANSVARSFRISKRIVELSE: Dette er en ny implementering af BUHLMANN algoritmen og dykkerplaner og har kun haft begrænset tests. Vi anbefaler der stærkt at der ikke planlægges dyk ALENE baseret på dette resultat.</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Dato</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Dato og Tid</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Dato:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">Dec</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">Standard XML data fil</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Slet data ...</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Slet dyk</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Slet dyk</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Dybde</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Dybde grænse overskredet</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Dybde:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Device Id</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Device or mount point</translation>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Dyk #%d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Dyk %d: %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Kælenavn for dykkercomputer</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Dyk info</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Dyk notater</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Dykkerplan - DETTE ER KUN EN SIMULATION. BRUG IKKE TIL DYKNING</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Dykker Tid</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Dykker Tid Alarm</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Dykker Tid info</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Dykkercomputer mærke og fabrikat</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Import fejl i dykker data</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Dykker steder</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Divemaster</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Dyk begynder hvornår?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Dyk nr:</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Dykkerliste font</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Divemaster</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Dyk</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Dykkersteder</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Download fra dykkercomputer</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Download fra Dykkercomputer...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Download fra Web</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Download fra Web...</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Download succes!</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Varighed</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Varighed (min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Rediger</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Rediger enheds navne</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Rediger dykkercomputer navne</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Rediger tur info</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Rediger tur summering</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Rediger dyk</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Rediger dykker dato/tid</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Rediger dyk</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Rediger flere dyk</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Rediger tur summering</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Tænd / slut hændelser</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Slut</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Slut dybde</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Indtast bruger ID og tryk på &apos;Download&apos;. Efter download kan du trykke på &apos;Tilføj&apos; hvis du ønsker at tilføje ændringerne.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Udstyr</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Fejl</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Fejl i læsning af saltindhold i vandet</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Fejl ved fortolkning af dato/tid</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Fejl i fortolkning af dykkertid</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Fejl i fortolkning af gas blanding</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Fejl i fortolkning af antallet af gasser</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Fejl i fortolkning af max dybde</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Fejl i fortolkning af prøver</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Error registering the cancellation handler.</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Fejl i registrering af data</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Error registering the event handler.</translation>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Event: waiting for user action</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Udvid alt</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Fejl i åbning %i filer.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Fejl i fortolkning af &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Fejl i læsning af &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">Feb</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">Fod</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Fil</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filter</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Tving download af alle dyk</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Fre</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFhigh</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFhigh til plan</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFlow</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFlow til plan</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (WGS84 or GPS format)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Gas brugt</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Gas brugt</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Gas Brugt</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Gasforbrug:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Gasblanding</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Indstillinger</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Hjælp</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">Idle</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Info</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Init Communication</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Input Plan</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Ugyldig dybde - kunne ikke fortolke &quot;%s&quot;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Ugyldig dybde - dybder mere end 400 meter er ikke understøttet</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Ugyldig gas for række %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Ugyldig starttid</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Ugyldig bruger navn</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Jan</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">Jul</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">Jun</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel, og andre, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Liste</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">Liter</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Sted</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Længest</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Længste dyk</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Lav batteri alarm</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Lav batteri alarm</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Set sted til her</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Marker</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Master</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Max deko tid advarsel</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Max dybde</translation>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Max SAC</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Max temp</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Max dybde: %.*f %s⏎
-Varighed: %d min⏎
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Max. CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">MaxPress</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Maximalt</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Maksimalt</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Maksimal</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">Maj</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Flet dyk</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Flet tur med turen over</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Flet tur med turen under</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">Meter</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Min dybde</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Min SAC</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Min Temp</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Flere valgmuligheder</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Model</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Man</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Multi-platform dykkerlog log software i C</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Ny</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Nyt begyndelsesnummer</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Næste DC</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Kaldenavn</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Ingen flaske data</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Noter</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">Nov</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">OLF</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">Okt</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Odd pthread error return</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Slet det valgte?</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Åben fil</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Åben...</translation>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Ilt</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">PO2 opstignings alarm</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">PO2 opstignings alarm</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">PO2 Grøn advarsel</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">PSI</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Password</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Vælg på kort</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Planlægger</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Indstillinger</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Indstillinger...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Tryk</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Tryk:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Forrige DC</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">Udskriv i farver</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Print kun valgte dyk</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Print valgte</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Print...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Profil</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Profil indstillinger</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Slet</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Fjern turen</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Fjern dyk fra turen</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Fjern valgte dyk fra turen</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">SAC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Lør</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Gem som...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Gem ændringer?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Gem filen som</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Gem som</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Gem...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">Sep</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Korteste dyk</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">Vis EAD, END, EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">Vis MOD</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Vis på kort</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">Vis pHe graf</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">Vis pN%s graf</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">Vis pO%s graf</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simuleret Dyk</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Størrelse</translation>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Hastighedsalam</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Hastighedsalarm</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Start</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Begynd download</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Statistik</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Statistik for %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Statistik</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Status</translation>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Dragt</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Søn</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Overflade interval</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Overflade tryk (mbar)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Skift gas til %s⏎
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Print tabel</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Flaske skift anbefalet</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Flaske tryk info</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Tec opsætning</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Temp</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Temperatur</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Temperatur:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Tre</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Tor</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Tid</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">For at ændre dykker information⏎
-double click i dykke listen</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Skift Zoom</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">For mange gas blandinger</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">For mange waypoints</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Total</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Total tid</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Total vægt:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Tir</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Brugermanual</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Sigtbarhed</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">V</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Vandtemperatur</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Ons</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Vægt</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Vægtsystem</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Vægt:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">XML fil</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">År</translation>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">luft</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">ankel</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">opstigning</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">bagpladevægt</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">bælte</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">bogmærke</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">grotte</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">hule</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">data</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">deco</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">deco stop</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">dybde</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">dybe stop</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">dykketid</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">tørdragt</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">for alle dyk</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">for dyk #%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">for dyk #</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">for det valgte dyk</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">for de valgte dyk</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">ferskvand</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">fod</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">heldragt</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">gasskifte</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">is</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">integreret</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">sø</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">pund (lbs)</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">Maks. ppO2</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">Maks. dybde</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">membran</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">min.</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">mere end %d dage</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">nat</translation>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">pascal</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">fotografering</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">swimming pool</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">flod</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">sikkerhedsstop</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">semidry</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">strand</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">shorty</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">overflade</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">undervisning</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">kursus</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">video</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">våddragt</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">vrag</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="da_DK" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Tid</translation>
+        <translation>Tid</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Dybde</translation>
+        <translation>Dybde</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Temp</translation>
+        <translation>Temp</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1761,57 +77,57 @@ double click i dykke listen</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Størrelse</translation>
+        <translation>Størrelse</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1819,41 +135,41 @@ double click i dykke listen</translation>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Rediger dykkercomputer navne</translation>
+        <translation>Rediger dykkercomputer navne</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Model</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Model</translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Kaldenavn</translation>
+        <translation>Kaldenavn</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1861,12 +177,12 @@ double click i dykke listen</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1874,95 +190,87 @@ double click i dykke listen</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Flet tur med turen over</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Flet tur med turen under</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1970,48 +278,48 @@ double click i dykke listen</translation>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2019,23 +327,23 @@ double click i dykke listen</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2043,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">LUFT</translation>
+        <translation>LUFT</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Varighed</translation>
+        <translation>Varighed</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2081,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2099,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Dato</translation>
+        <translation>Dato</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">fod</translation>
+        <translation>fod</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">min.</translation>
+        <translation>min.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">pund (lbs)</translation>
+        <translation>pund (lbs)</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Dragt</translation>
+        <translation>Dragt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Cyl</translation>
+        <translation>Cyl</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Sted</translation>
+        <translation>Sted</translation>
     </message>
 </context>
 <context>
@@ -2168,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Fejl</translation>
+        <translation>Fejl</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2186,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Download fra dykkercomputer</translation>
+        <translation>Download fra dykkercomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Tving download af alle dyk</translation>
+        <translation>Tving download af alle dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2234,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Dyk notater</translation>
+        <translation>Dyk notater</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Sted</translation>
+        <translation>Sted</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Divemaster</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Makker</translation>
+        <translation>Makker</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Sigtbarhed</translation>
+        <translation>Sigtbarhed</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Dragt</translation>
+        <translation>Dragt</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Noter</translation>
+        <translation>Noter</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Udstyr</translation>
+        <translation>Udstyr</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Dyk info</translation>
+        <translation>Dyk info</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Dato</translation>
+        <translation>Dato</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Dykker Tid</translation>
+        <translation>Dykker Tid</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Statistik</translation>
+        <translation>Statistik</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Dybde</translation>
+        <translation>Dybde</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatur</translation>
+        <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Varighed</translation>
+        <translation>Varighed</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Total tid</translation>
+        <translation>Total tid</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Dyk</translation>
+        <translation>Dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Flasker </translation>
+        <translation>Flasker </translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -2461,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">Ø</translation>
+        <translation>Ø</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">V</translation>
+        <translation>V</translation>
     </message>
 </context>
 <context>
@@ -2494,401 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Fil</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Hjælp</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Ny</translation>
+        <translation>Ny</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Gem</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Gem som</translation>
+        <translation>Gem som</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Luk</translation>
+        <translation>Luk</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Profil</translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Info</translation>
+        <translation>Info</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Indstillinger</translation>
+        <translation>Indstillinger</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Rediger enheds navne</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Skift Zoom</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Forrige DC</translation>
+        <translation>Forrige DC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Næste DC</translation>
+        <translation>Næste DC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Input Plan</translation>
+        <translation>Input Plan</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Om Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Brugermanual</translation>
+        <translation>Om Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Åben fil</translation>
+        <translation>Åben fil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Gem ændringer?</translation>
+        <translation>Gem ændringer?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -2898,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2916,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Dyk</translation>
+        <translation>Dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Dybde</translation>
+        <translation>Dybde</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">Meter</translation>
+        <translation>Meter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">Fod</translation>
+        <translation>Fod</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Tryk</translation>
+        <translation>Tryk</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <translation>Bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">Liter</translation>
+        <translation>Liter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">CuFt</translation>
+        <translation>CuFt</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatur</translation>
+        <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Celsius</translation>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Fahrenheit</translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Vægt</translation>
+        <translation>Vægt</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">pund (lbs)</translation>
+        <translation>pund (lbs)</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3206,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3214,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Dyk nr:</translation>
+        <translation>Dyk nr:</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Dato</translation>
+        <translation>Dato</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Dybde</translation>
+        <translation>Dybde</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Varighed</translation>
+        <translation>Varighed</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Master</translation>
+        <translation>Master</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Makker</translation>
+        <translation>Makker</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Sted</translation>
+        <translation>Sted</translation>
     </message>
 </context>
 <context>
@@ -3252,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Print kun valgte dyk</translation>
+        <translation>Print kun valgte dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">Udskriv i farver</translation>
+        <translation>Udskriv i farver</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 dyk pr side</translation>
+        <translation>6 dyk pr side</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 dyk pr side</translation>
+        <translation>2 dyk pr side</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Print tabel</translation>
+        <translation>Print tabel</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3337,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Rediger</translation>
+        <translation>Rediger</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">luft</translation>
+        <translation>luft</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Bailing out to OC</translation>
+        <translation>Bailing out to OC</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">start</translation>
+        <translation>start</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">slut</translation>
+        <translation>slut</translation>
     </message>
 </context>
 <context>
@@ -3425,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Flaske</translation>
+        <translation>Flaske</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Gasblanding</translation>
+        <translation>Gasblanding</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Gas Brugt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Max. CNS</translation>
+        <translation>Max. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3488,50 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">LUFT</translation>
+        <translation>LUFT</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Luk</translation>
+        <translation>Luk</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Gennemsnit</translation>
+        <translation>Gennemsnit</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished">Minimum</translation>
+        <translation>Minimum</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Maksimal</translation>
     </message>
 </context>
 <context>
@@ -3539,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Nyt begyndelsesnummer</translation>
+        <translation>Nyt begyndelsesnummer</translation>
     </message>
 </context>
 <context>
@@ -3552,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3580,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Om Subsurface</translation>
+        <translation>Om Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3608,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Forbindelses fejl:</translation>
+        <translation>Forbindelses fejl:</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Ugyldig bruger navn</translation>
+        <translation>Ugyldig bruger navn</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Kan ikke fortolke svar!</translation>
+        <translation>Kan ikke fortolke svar!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Download succes!</translation>
+        <translation>Download succes!</translation>
     </message>
 </context>
 <context>
@@ -3646,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>Bar</translation>
     </message>
 </context>
 <context>
@@ -3677,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -3698,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Password</translation>
+        <translation>Password</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3736,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Vægt</translation>
+        <translation>Vægt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3755,42 +2031,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -3798,7 +2074,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -3806,19 +2082,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3826,64 +2102,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">pascal</translation>
+        <translation>pascal</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">fod</translation>
+        <translation>fod</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">pund (lbs)</translation>
+        <translation>pund (lbs)</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) eller (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) eller (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -3893,32 +2165,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">luft</translation>
+        <translation>luft</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">integreret</translation>
+        <translation>integreret</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">bælte</translation>
+        <translation>bælte</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">ankel</translation>
+        <translation>ankel</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">bagpladevægt</translation>
+        <translation>bagpladevægt</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -3928,309 +2200,301 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Fejl i læsning af &apos;%s&apos;</translation>
+        <translation>Fejl i læsning af &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">deco stop</translation>
+        <translation>deco stop</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">opstigning</translation>
+        <translation>opstigning</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">bogmærke</translation>
+        <translation>bogmærke</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">overflade</translation>
+        <translation>overflade</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">sikkerhedsstop</translation>
+        <translation>sikkerhedsstop</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">gasskifte</translation>
+        <translation>gasskifte</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">dybe stop</translation>
+        <translation>dybe stop</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">dykketid</translation>
+        <translation>dykketid</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">Maks. dybde</translation>
+        <translation>Maks. dybde</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">OLF</translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Fejl i registrering af data</translation>
+        <translation>Fejl i registrering af data</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Fejl ved fortolkning af dato/tid</translation>
+        <translation>Fejl ved fortolkning af dato/tid</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Dyk %d: %s %d %04d</translation>
+        <translation>Dyk %d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Fejl i fortolkning af dykkertid</translation>
+        <translation>Fejl i fortolkning af dykkertid</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Fejl i fortolkning af max dybde</translation>
+        <translation>Fejl i fortolkning af max dybde</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Fejl i fortolkning af antallet af gasser</translation>
+        <translation>Fejl i fortolkning af antallet af gasser</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Fejl i læsning af saltindhold i vandet</translation>
+        <translation>Fejl i læsning af saltindhold i vandet</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Fejl i fortolkning af gas blanding</translation>
+        <translation>Fejl i fortolkning af gas blanding</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Fejl i fortolkning af prøver</translation>
+        <translation>Fejl i fortolkning af prøver</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Event: waiting for user action</translation>
+        <translation>Event: waiting for user action</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Error registering the event handler.</translation>
+        <translation>Error registering the event handler.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Error registering the cancellation handler.</translation>
+        <translation>Error registering the cancellation handler.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Import fejl i dykker data</translation>
+        <translation>Import fejl i dykker data</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Fejl i fortolkning af &apos;%s&apos;</translation>
+        <translation>Fejl i fortolkning af &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Kan ikke finde gas %d/%d</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Flaske for planlægning</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simuleret Dyk</translation>
+        <translation>Kan ikke finde gas %d/%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">For mange gas blandinger</translation>
+        <translation>For mange gas blandinger</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4239,7 +2503,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 Subsurface dykkerplan⏎
 baseret på GFlow = %.0f og GFhigh = %.0f⏎
 
@@ -4249,165 +2513,161 @@ baseret på GFlow = %.0f og GFhigh = %.0f⏎
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Skift gas til %s⏎
+        <translation>Skift gas til %s⏎
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Gasforbrug:
+        <translation>Gasforbrug:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s of %s⏎
+        <translation>%.0f%s of %s⏎
 
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 P:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 Beregnet loft %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 Sikkerhedsstop:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 Sikkerhedsstop:Ukendt tid @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 Deko:unkn time @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 In deko</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 pN%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 pHe:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 MOD:%d%s</translation>
     </message>
     <message>
@@ -4416,7 +2676,7 @@ MOD:%d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s⏎
+        <translation>%s⏎
 EAD:%d%s⏎
 END:%d%s⏎
 EADD:%d%s</translation>
@@ -4425,546 +2685,534 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">strand</translation>
+        <translation>strand</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">dybde</translation>
+        <translation>dybde</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">hule</translation>
+        <translation>hule</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">is</translation>
+        <translation>is</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">vrag</translation>
+        <translation>vrag</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">grotte</translation>
+        <translation>grotte</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">swimming pool</translation>
+        <translation>swimming pool</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">sø</translation>
+        <translation>sø</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">flod</translation>
+        <translation>flod</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">nat</translation>
+        <translation>nat</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">ferskvand</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">kursus</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">undervisning</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">fotografering</translation>
+        <translation>fotografering</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">video</translation>
+        <translation>video</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">deco</translation>
+        <translation>deco</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">mere end %d dage</translation>
+        <translation>mere end %d dage</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dd %dh %dmin</translation>
+        <translation>%dd %dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dh %dmin</translation>
+        <translation>%dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">for dyk #</translation>
+        <translation>for dyk #</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">for de valgte dyk</translation>
+        <translation>for de valgte dyk</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">for dyk #%d</translation>
+        <translation>for dyk #%d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">for det valgte dyk</translation>
+        <translation>for det valgte dyk</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">for alle dyk</translation>
+        <translation>for alle dyk</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(ingen dyk)</translation>
+        <translation>(ingen dyk)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">Søn</translation>
+        <translation>Søn</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">Man</translation>
+        <translation>Man</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">Tir</translation>
+        <translation>Tir</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">Ons</translation>
+        <translation>Ons</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">Tor</translation>
+        <translation>Tor</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">Fre</translation>
+        <translation>Fre</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">Lør</translation>
+        <translation>Lør</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">Jan</translation>
+        <translation>Jan</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">Feb</translation>
+        <translation>Feb</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">Mar</translation>
+        <translation>Mar</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">Apr</translation>
+        <translation>Apr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">Maj</translation>
+        <translation>Maj</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">Jun</translation>
+        <translation>Jun</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">Jul</translation>
+        <translation>Jul</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">Aug</translation>
+        <translation>Aug</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">Sep</translation>
+        <translation>Sep</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">Okt</translation>
+        <translation>Okt</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">Nov</translation>
+        <translation>Nov</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">Dec</translation>
+        <translation>Dec</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="25"/>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">data</translation>
+        <translation>data</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">våddragt</translation>
+        <translation>våddragt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">semidry</translation>
+        <translation>semidry</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">tørdragt</translation>
+        <translation>tørdragt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">shorty</translation>
+        <translation>shorty</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">heldragt</translation>
+        <translation>heldragt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">2-delt heldragt</translation>
+        <translation>2-delt heldragt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">membran</translation>
+        <translation>membran</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Init Communication</translation>
+        <translation>Init Communication</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Begynd download</translation>
+        <translation>Begynd download</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Hastighedsalam</translation>
+        <translation>Hastighedsalam</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Hastighedsalarm</translation>
+        <translation>Hastighedsalarm</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">PO2 Grøn advarsel</translation>
+        <translation>PO2 Grøn advarsel</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">PO2 opstignings alarm</translation>
+        <translation>PO2 opstignings alarm</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">PO2 opstignings alarm</translation>
+        <translation>PO2 opstignings alarm</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Flaske tryk info</translation>
+        <translation>Flaske tryk info</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Flaske skift anbefalet</translation>
+        <translation>Flaske skift anbefalet</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Dybde grænse overskredet</translation>
+        <translation>Dybde grænse overskredet</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Max deko tid advarsel</translation>
+        <translation>Max deko tid advarsel</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Dykker Tid info</translation>
+        <translation>Dykker Tid info</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Dykker Tid Alarm</translation>
+        <translation>Dykker Tid Alarm</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Marker</translation>
+        <translation>Marker</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Ingen flaske data</translation>
+        <translation>Ingen flaske data</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Lav batteri alarm</translation>
+        <translation>Lav batteri alarm</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Lav batteri alarm</translation>
+        <translation>Lav batteri alarm</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts
index f38f7bf4c..6e278c378 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -1,2389 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-Keine Ereignisse
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete"> &gt; Monat</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete"> herunterladen</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete"> Bitte Tauchcomputer und Anschluss auswählen. </translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> Anfang</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> Ende</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">Nr.</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s%2$s %4$d. %3$s %5$d   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d   %5$dh%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dd %dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-Berechneter tiefster Deko-Stopp %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deko:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deko:unbk Zeit @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-In Deko</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL:%umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-D:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Sicherheitsstopp:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Sicherheitsstopp:unbk Zeit @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Subsurface Tauchplan
-basierend auf GFlow = %.0f und GFhigh = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s event at %d:%02u</source>
-        <translation type="obsolete">%s Ereignis (%d:%02u)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s: Response from divelogs.de</source>
-        <translation type="obsolete">%s: Antwort von divelogs.de</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) oder (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(um Datum/Zeit zu bearbeiten hier klicken)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(um Datum/Zeit/Tiefe zu bearbeiten hier klicken)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(keine Tauchgänge)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(nichts)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 cuft/min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 cuft/min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 l/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 Tauchgänge pro Seite</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">Zweiteiler</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 l/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">3m Stufen für berechnete Deko-Stopps</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 Tauchgänge pro Seite</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;Add segments below.
-Each line describes part of the planned dive.
-An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. &apos;+3:30&apos;) or ends at the given time (if absolute e.g &apos;@5:00&apos;, &apos;runtime&apos;), and uses the given gas.
-An empty gas means &apos;use previous gas&apos; (or AIR if no gas was specified).
-An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.
-CC SetPoint specifies CC (rebreather) dives, leave empty for OC.&lt;/small&gt;
-</source>
-        <translation type="obsolete">&lt;small&gt;Segmente hier hinzufügen.
-Jede Zeile beschreibt einen Abschnitt des geplanten Tauchgangs.
-Ein Eintrag mit Tiefe, Zeit und Atemgas beschreibt einen Abschnitt, der auf der angegeben Tiefe endet, die angegebene Zeit dauert (falls relativ, also &apos;+3:30&apos;) oder zur angegebenen Zeit endet (falls absolut) und der das angegebene Atemgas verwendet.
-Keine Gasangabe bedeutet &apos;benutze vorheriges Atemgas&apos; (oder Luft, falls kein Atemgas spezifiziert wurde).
-Ein Eintrag mit Tiefe und Atemgas aber keiner Zeitangabe dient einem besonderen Zweck: er informiert den Plan-Algorithmus, dass das angegebene Atemgas für den Aufstieg verfügbar ist sobald die angegebene Tiefe erreicht ist.
-CC SetPoint ist fuer geschlossene Kreislaufgeräte; bitte nicht ausfüllen für Tauchgänge mit offenem Tauchgerät.&lt;/small&gt;
-</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">Luft</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">Info zu Subsurface</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Setze</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Tauchgang hinzufügen...</translation>
-    </message>
-    <message>
-        <source>Add bookmark event here</source>
-        <translation type="obsolete">Markierung hier setzen</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Tauchgang hinzufügen</translation>
-    </message>
-    <message>
-        <source>Add gas change event here</source>
-        <translation type="obsolete">Gaswechsel hier setzen</translation>
-    </message>
-    <message>
-        <source>Add gaschange event at %d:%02u</source>
-        <translation type="obsolete">Gaswechsel setzen bei %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Zur obigen Reise hinzufügen</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Weiteren Abschnitt hinzufügen</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Luftdruck</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Lufttemp.</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Lufttemp. in %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Immer heruntergeladene Tauchgänge bevorzugen</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">Apr</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">Aug</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Automatisch gruppieren</translation>
-    </message>
-    <message>
-        <source>Available gases</source>
-        <translation type="obsolete">Verfügbare Gase</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Ø Tiefe</translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Ø Tiefe (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">Ø SAC</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Ø Temp</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Ø Dauer</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Notausstieg mit offenem System</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Partner</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CC SetPoint</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Kann Gasgemisch %d/%d nicht finden</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">Fehler beim Öffnen des Styleshhets (%s)/%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Abgebrochen, beende...</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Abgebrochen...</translation>
-    </message>
-    <message>
-        <source>Cannot add gas change</source>
-        <translation type="obsolete">Kann keinen Gaswechsel setzen</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Verstehe die Antwort nicht!</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Celsius</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Standard XML-Datei auswählen</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Bitte XML-Dateien auswählen, die in die aktuelle Datei eingefügt werden sollen</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Schliessen</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Alle einfalten</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Verbinde...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Verbindungsfehler: </translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Neue Reise darüber einfügen</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">cuft</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Flasche</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Flasche</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Flasche für Tauchplanung</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Flaschen</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">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>
-        <source>Database connection failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Datenbank Verbindung fehlgeschlagen &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query get_events failed.
-</source>
-        <translation type="obsolete">Datenbank Anfrage der Events fehlgeschlagen.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Datum und Zeit</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Datum:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">Dez</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">Standard XML Datei</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Lösche die Informationen zu einem Tauchcomputer</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Tauchgang löschen</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Tauchgänge löschen</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Tiefe</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Tiefenlimit überschritten</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Tiefe:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Gerätebezeichnung</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Gerät oder Einhängepunkt</translation>
-    </message>
-    <message>
-        <source>Display invalid dives</source>
-        <translation type="obsolete">Ungültige Tauchgänge anzeigen</translation>
-    </message>
-    <message>
-        <source>Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</source>
-        <extracomment>++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-&lt;trailing text&gt;
-</extracomment>
-        <translation type="obsolete">Tauchgang #%1$d - %2$s %4$02d.%3$02d.%5$04d um %6$d:%7$02d %8$s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Tauchgang #%d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Tauchgang Nr. %d: %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Bezeichnung für den Tauchcomputer</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Informationen</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Notizen</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Tauchplan - DIES IST NUR EINE SUMULATION; NICHT ZUM TAUCHEN VERWENDEN</translation>
-    </message>
-    <message>
-        <source>Dive Tags</source>
-        <translation type="obsolete">Tauchgang Tags</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Dauer</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Alarm: Tauchgangsdauer</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Info: Tauchgangsdauer</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Hersteller und Modell</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Fehler beim Importieren der Tauchgangsdaten</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Tauchplätze</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Tauchguide</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Wann beginnt der Tauchgang?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Tauchgang Nr.</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Schriftart für Tauchliste</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Tauchguide</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Tauchgänge</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Tauchplätze</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Von Tauchcomputer laden</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Von Tauchcomputer laden...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Vom Webserver laden</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Vom Webserver laden...</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Erfolgreich geladen!</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Dauer</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Dauer (min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">O</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Gerätename bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Tauchcomputer Bezeichnung bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Reise-Informationen bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Reise-Übersicht bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Der Name des Tauchcomputers kann durch Doppelklick bearbeitet werden</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Tauchgang bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Zeit des Tauchgangs bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Tauchgänge bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Mehrere Tauchgänge bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Reise-Übersicht bearbeiten</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Ereignisse Ein-/Ausblenden</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Tags</source>
-        <translation type="obsolete">Tags Ein- / Ausschalten</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Ende</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Tiefe am Ende</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Benutzerkennung eingeben und &apos;Laden&apos; drücken. Bei Erfolg &apos;Anwenden&apos; drücken um die Daten zu übernehmen.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Ausrüstung</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Fehler</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Fehler beim Lesen des Salzgehalts</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Fehler beim Lesen des Datums</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Fehler beim Lesen der Dauer</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Fehler beim Lesen der Gasgemischs</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Fehler beim Lesen der Gasgemischszahl</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Fehler beim Lesen der maximalen Tiefe</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Fehler beim Lesen der Samples</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Fehler bei der Registrierung der Abbruchbehandlung</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Fehler beim Registrieren der Daten</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Fehler beim Registrieren der Ereignisbehandlung</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Ereignis: systime=%&lt;PRId64&gt;, devtime=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Ereignis: warte auf Benutzeraktion</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Alle ausfalten</translation>
-    </message>
-    <message>
-        <source>Export As UDDF File</source>
-        <translation type="obsolete">Als UDDF Datei exportieren</translation>
-    </message>
-    <message>
-        <source>Export UDDF...</source>
-        <translation type="obsolete">Exportiere UDDF ...</translation>
-    </message>
-    <message>
-        <source>Export dive(s) to UDDF</source>
-        <translation type="obsolete">Exportiere Tauchgang/-gänge als UDDF</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Fehler beim Öffnen von %i Dateien</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Fehler beim Lesen von &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Fehler beim Lesen von &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Fehler beim Lesen von &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Fehler beim Lesen von &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">Feb</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">Fuss</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Datei</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filter</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Erzwinge erneutes Laden aller Tauchgänge</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Fr</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFhigh</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFhigh für Tauchplan</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFlow</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFlow für Tauchplan</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (WGS84 oder GPS Format)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Gasverbrauch</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Gasverbrauch</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Verw. Gas</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Gasverbrauch:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Gasgemisch</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Allg. Einstellungen</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Hilfe</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">inaktiv</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Importiere Datei(en)...</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Informationen</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Verbindung aufbauen</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Plan eingeben</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Ungültige Tiefe - kann &quot;%s&quot; nicht lesen</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Ungültige Tiefe - Werte unterhalb 400m sind nicht unterstützt</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Ungültiges Gasgemisch in Zeile %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Ungültige Anfangszeit</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Ungültige Benutzerkennung</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Jan</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">Jul</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">Jun</translation>
-    </message>
-    <message>
-        <source>Last stop at 20 Feet</source>
-        <translation type="obsolete">Letzter Stopp bei 20 Fuss</translation>
-    </message>
-    <message>
-        <source>Last stop at 6 Meters</source>
-        <translation type="obsolete">Letzter Stopp bei 6 Meter</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Layout Einstellungen</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel und andere, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Liste</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">Liter</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Ort</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Max.</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Längster Tauchgang</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Alarm: Batterie schwach</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Warnung: Batterie schwach</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Kartenanbieter</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">Mär</translation>
-    </message>
-    <message>
-        <source>Mark invalid</source>
-        <translation type="obsolete">Als ungültig markieren</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Hier markieren</translation>
-    </message>
-    <message>
-        <source>Mark valid</source>
-        <translation type="obsolete">Als gültig markieren</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Markierung</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Guide</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Warnung: Maximale Deko Zeit</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Max. Tiefe</translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Max. Tiefe (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Max. SAC</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Max. Temp.</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Max. Tiefe: %.*f %s
-Dauer: %d min
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Max. CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Max. Druck</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Max.</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Max.</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Max.</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">Mai</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Tauchgänge zusammenführen</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Reise mit der darüber verbinden</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Reise mit der darunter verbinden</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">Meter</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Min. Tiefe</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Min. SAC</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Min. Temp.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Min.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Min.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Min.</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Verschiedene Optionen</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Modell</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Mo</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Multi-Plattform Tauchprogramm in C</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Neue erste Nummer</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Nächster TC</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Gerätename</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Keine Flaschen Informationen</translation>
-    </message>
-    <message>
-        <source>No cylinders listed for this dive.</source>
-        <translation type="obsolete">Keine Flaschen für diesen Tauchgang</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notizen</translation>
-    </message>
-    <message>
-        <source>Notes height (%d%% - %d%%)</source>
-        <translation type="obsolete">Höhe der Notizen (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Notizen oben</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">Nov</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">OLF</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">Okt</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Unbekannter pthread Fehlercode</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Ausgewählten Eintrag löschen?</translation>
-    </message>
-    <message>
-        <source>Only display dives with these tags:</source>
-        <translation type="obsolete">Zeige nur Tauchgänge mit diesen Tags:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Datei öffnen</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Öffnen...</translation>
-    </message>
-    <message>
-        <source>Ordering</source>
-        <translation type="obsolete">Reihenfolge</translation>
-    </message>
-    <message>
-        <source>Other data height (%d%% - %d%%)</source>
-        <translation type="obsolete">Höhe der anderen Daten (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Sauerstoff</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO₂</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Alarm: Aufstieg / PO₂</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Warnung: Aufstieg / PO₂</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Warnung: PO₂ Grün</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Auf Karte auswählen</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Planer</translation>
-    </message>
-    <message>
-        <source>Please enter your userid and password for divelogs.de. The selected dives will be added to your account</source>
-        <translation type="obsolete">Bitte Benutzerkennung und Passwort für divelogs.de eingeben. Die ausgewählten Tauchgänge werden zum Benutzerkonto hinzugefügt.</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Einstellungen</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Einstellungen...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Druck</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Druck:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Vorh. TC</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">In Farbe drucken</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Nur ausgewählte Tauchgänge drucken</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Auswahl drucken</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Art des Ausdrucks</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Drucken...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Profil</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Profil Einstellungen</translation>
-    </message>
-    <message>
-        <source>Profile height (%d%% - %d%%)</source>
-        <translation type="obsolete">Höhe des Profils (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Profil oben</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Beenden</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Alarm: verbleibende Gas-Zeit</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Warnung: verbleibende Gas-Zeit</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Bewertung</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Lese %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Entferne</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Reise entfernen</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Tauchgang aus Reise entfernen</translation>
-    </message>
-    <message>
-        <source>Remove event here</source>
-        <translation type="obsolete">Ereignis hier entfernen</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Ausgewählte Tauchgänge aus Reise entfernen</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Neu nummerieren</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Neu nummerieren...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Wiederholen</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">SAC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">SAC während Dekostopp</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">SAC während des Tauchgangs</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Verletzung des Sicherheitsstopps</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sa</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Speichern unter...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Änderungen speichern?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Datei speichern unter</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Speichern unter</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Speichern...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Segment Dauer</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Ereignisse auswählen</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Ereignisse auswählen...</translation>
-    </message>
-    <message>
-        <source>Select Tags...</source>
-        <translation type="obsolete">Tags auswählen...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">Sep</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Unvollständiger Schreibvorgang der req.txt Datei
-Ist der Uemis Zürich korrekt verbunden?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Min.</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Kürzester Tauchgang</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Spalten anzeigen</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">EAD, END, EADD anzeigen</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">MOD anzeigen</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Berechnete tiefste Deko-Stopps anzeigen</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Vom TC ausgelesene tiefste Deko-Stopps rot anzeigen</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Auf Karte zeigen</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">pHe Diagramm anzeigen</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">pN%s Diagramm anzeigen</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">pO%s Diagramm anzeigen</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simulierter Tauchgang</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Grösse</translation>
-    </message>
-    <message>
-        <source>Sizing heights (%% of layout)</source>
-        <translation type="obsolete">Höhe (%% des Layouts)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Alarm: Geschwindigkeit</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Warnung: Geschwindigkeit</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Start</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Beginne zu Laden</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Statistiken</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Statistiken %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Statistiken</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Status</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Unverständliche Prozentangabe %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Anzug</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">So</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Oberflächenpause</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Oberflächendruck (mbar)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Gaswechsel zu %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Tabellendruck</translation>
-    </message>
-    <message>
-        <source>Tags are only shown if they are identical for all edited dives</source>
-        <translation type="obsolete">Tauchgang-Tags werden nur angezeigt, wenn sie in allen editierten Tauchgängen identisch waren</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Gaswechsel-Vorschlag</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Info: Flaschendruck</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Tec-Einstellungen</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Temperatur</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Temperatur</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Temperatur:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Drei</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Zeit</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Zum Tauchgangsdaten bearbeiten
-Doppelklick in der Tauchgangsliste</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zoom ein-/ausschalten</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">Zu viele Gasgemische</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">Zu viele Abschnitte</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Gesamt</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Gesamtzeit</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Gesamtgewicht:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Auftauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgang)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Typ</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zürich: Dateisystem beinahe voll
-Bitte den Tauchcomputer ausstecken, wieder einstecken
-und erneut versuchen</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zürich: Dateisystem voll.
-Bitte den Tauchcomputer ausstecken, wieder einstecken
-und erneut versuchen</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Uemis-Initialisierung fehlgeschlagen</translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">Fehler beim Erzeugen des libdivecomputer Contexts</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Nicht in der Lage, einen Parser für %s %s zu erstellen</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Fehler beim Öffnen von %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Einheiten</translation>
-    </message>
-    <message>
-        <source>Upload dive(s) to divelogs.de</source>
-        <translation type="obsolete">Tauchgang/-gänge zu divelogs.de hochladen</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de</source>
-        <translation type="obsolete">Zu divelogs.de hochladen</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de...</source>
-        <translation type="obsolete">Lade zu divelogs.de hoch...</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Der Tauchplatz kann mittels rechter Maustaste an der Mausposition markiert werden</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Benutzerkennung</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Benutzerhandbuch</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Ansicht</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Sicht</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Volumen:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">W</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Warnung - extrem lange Tauchgänge können zu sehr langen Berechnungszeiten führen</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Warnung - extrem tiefe Tauchgänge können zu sehr langen Berechnungszeiten führen</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Wassertemperatur</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Webservice</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mi</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Gewicht</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Gewichtsystem</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Gewicht:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">XML-Datei</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Jahr</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Jahresstatistiken</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">Sie haben bereits einen Tauchcomputer dieses Modells
-mit Namen %s.
-Subsurface kann einen Namen für dieses Gerät verwalten, um die Geräte zu unterscheiden. Die Voreinstellung ist unten angezeigt.
-Falls kein Name gewünscht ist, bitte &apos;Abbrechen&apos; klicken. Subsurface zeigt dann einfach den Produktnamen an (in diesem Fall können eventuell verschiedene Tauchcomputer nicht mehr in den angezeigten Daten unterschieden werden).</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Nicht alle Änderungen wurden gespeichert.
-Sollen Änderungen vor dem Schliessen der Datei gespeichert werden?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Nicht alle Änderungen in der Datei %s wurden gespeichert.
-Sollen Änderungen vor dem Schliessen der Datei gespeichert werden?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">Luft</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">verbleibende Atemzeit</translation>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">Berg</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">Fussblei</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">Aufstieg</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">Backplate-Gewicht</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">Gürtel</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">Boot</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">Markierung</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">Höhle</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">Kaverne</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">tiefster Deko-Stopp</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">Sicherheits-Stopp</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">clip-on</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">cuft</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">Daten</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">deko</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">Deko-Stopp</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">Tief</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">Tiefen-Stopp</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">Logbucheintrag mit ID</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">Tauchplatz Daten ID</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">Tauchgangsdauer</translation>
-    </message>
-    <message>
-        <source>drift</source>
-        <translation type="obsolete">Strömung</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">Trockentauchanzug</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">für alle Tauchgänge</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">für Tauchgang Nr. %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">für Tauchgänge Nr.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">für den ausgewählten Tauchgang</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">für die ausgewählten Tauchgänge</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">Süsswasser</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">ft</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">vollständiger Tauchanzug</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">Gaswechsel</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">Richtung</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">Eis</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">integriert</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">ungültig</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">ungültige Ereignisnummer</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">Jacke</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">See</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">US Pfund</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">Latzhose</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">max. ppO₂</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">max. CNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">Max. Tiefe</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">Membran</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">min</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">mehr Daten für Tauchgang ID</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">mehr als %d Tage</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">Nacht</translation>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">Nullzeit</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">keine</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">pHe Schwelle</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">pN%s Schwelle</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">pO%s Schwelle</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">Pa</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">Foto</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">Pool</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">rbt</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">Fluss</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">Sicherheitsstopp</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">Sicherheitsstopp (obligatorisch)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">Sicherheitsstopp (freiwillig)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">halbtrocken</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">Ufer</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">Shorty</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">Oberfläche</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">Unterricht</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">Gewebewarnung</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">Übung</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">Dirk Hohndel
-Martin Gysel</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">Sender</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">unbk</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">unbekannt</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">nicht angegeben</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">Weste</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">Video</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">Verletzung</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">Gewicht</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">Nass-Tauchanzug</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">Arbeit</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">Wrack</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_CH" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Zeit</translation>
+        <translation>Zeit</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Tiefe</translation>
+        <translation>Tiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Temperatur</translation>
+        <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2391,57 +77,57 @@ Martin Gysel</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Grösse</translation>
+        <translation>Grösse</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation>O2%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation>HE</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2449,41 +135,41 @@ Martin Gysel</translation>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Tauchcomputer Bezeichnung bearbeiten</translation>
+        <translation>Tauchcomputer Bezeichnung bearbeiten</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation>Den ausgewählten Tauchcomputer entfernen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Modell</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Modell</translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Gerätename</translation>
+        <translation>Gerätename</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2491,12 +177,12 @@ Martin Gysel</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation> l/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation> cuft/min</translation>
     </message>
 </context>
 <context>
@@ -2504,95 +190,87 @@ Martin Gysel</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Reise mit der darüber verbinden</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Reise mit der darunter verbinden</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2600,48 +278,48 @@ Martin Gysel</translation>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2649,23 +327,23 @@ Martin Gysel</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2673,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">Luft</translation>
+        <translation>Luft</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Dauer</translation>
+        <translation>Dauer</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2711,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2729,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">Nr.</translation>
+        <translation>Nr.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">min</translation>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">US Pfund</translation>
+        <translation>US Pfund</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Anzug</translation>
+        <translation>Anzug</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Flasche</translation>
+        <translation>Flasche</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">max. CNS</translation>
+        <translation>max. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Ort</translation>
+        <translation>Ort</translation>
     </message>
 </context>
 <context>
@@ -2798,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Fehler</translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Wiederholen</translation>
+        <translation>Wiederholen</translation>
     </message>
 </context>
 <context>
@@ -2816,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Von Tauchcomputer laden</translation>
+        <translation>Von Tauchcomputer laden</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Erzwinge erneutes Laden aller Tauchgänge</translation>
+        <translation>Erzwinge erneutes Laden aller Tauchgänge</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -2864,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Notizen</translation>
+        <translation>Notizen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation>Startzeit</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Ort</translation>
+        <translation>Ort</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Tauchguide</translation>
+        <translation>Tauchguide</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Partner</translation>
+        <translation>Partner</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Bewertung</translation>
+        <translation>Bewertung</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Sicht</translation>
+        <translation>Sicht</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Anzug</translation>
+        <translation>Anzug</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Notizen</translation>
+        <translation>Notizen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Ausrüstung</translation>
+        <translation>Ausrüstung</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Informationen</translation>
+        <translation>Informationen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Max. Tiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Ø Tiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Dauer</translation>
+        <translation>Dauer</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Statistiken</translation>
+        <translation>Statistiken</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Tiefe</translation>
+        <translation>Tiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatur</translation>
+        <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Dauer</translation>
+        <translation>Dauer</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Gesamtzeit</translation>
+        <translation>Gesamtzeit</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Tauchgänge</translation>
+        <translation>Tauchgänge</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Flaschen</translation>
+        <translation>Flaschen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -3091,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">unbekannt</translation>
+        <translation>unbekannt</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">O</translation>
+        <translation>O</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">W</translation>
+        <translation>W</translation>
     </message>
 </context>
 <context>
@@ -3124,417 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Datei</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Ansicht</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Hilfe</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Neu</translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Speichern unter</translation>
+        <translation>Speichern unter</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Schliessen</translation>
+        <translation>Schliessen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Profil</translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Informationen</translation>
+        <translation>Informationen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Einstellungen</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Beenden</translation>
+        <translation>Einstellungen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Gerätename bearbeiten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Neu nummerieren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zoom ein-/ausschalten</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Jahresstatistiken</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Vorh. TC</translation>
+        <translation>Vorh. TC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Nächster TC</translation>
+        <translation>Nächster TC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Ereignisse auswählen</translation>
+        <translation>Ereignisse auswählen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Plan eingeben</translation>
+        <translation>Plan eingeben</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Info zu Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Benutzerhandbuch</translation>
+        <translation>Info zu Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Datei öffnen</translation>
+        <translation>Datei öffnen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Änderungen speichern?</translation>
+        <translation>Änderungen speichern?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3544,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3562,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Einheiten</translation>
+        <translation>Einheiten</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Tauchgänge</translation>
+        <translation>Tauchgänge</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Tiefe</translation>
+        <translation>Tiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">Meter</translation>
+        <translation>Meter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">Fuss</translation>
+        <translation>Fuss</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Druck</translation>
+        <translation>Druck</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">Liter</translation>
+        <translation>Liter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">cuft</translation>
+        <translation>cuft</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatur</translation>
+        <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Celsius</translation>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Fahrenheit</translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Gewicht</translation>
+        <translation>Gewicht</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">US Pfund</translation>
+        <translation>US Pfund</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3852,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3860,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Tauchgang Nr.</translation>
+        <translation>Tauchgang Nr.</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Tiefe</translation>
+        <translation>Tiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Dauer</translation>
+        <translation>Dauer</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Guide</translation>
+        <translation>Guide</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Partner</translation>
+        <translation>Partner</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Ort</translation>
+        <translation>Ort</translation>
     </message>
 </context>
 <context>
@@ -3898,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Nur ausgewählte Tauchgänge drucken</translation>
+        <translation>Nur ausgewählte Tauchgänge drucken</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">In Farbe drucken</translation>
+        <translation>In Farbe drucken</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Art des Ausdrucks</translation>
+        <translation>Art des Ausdrucks</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 Tauchgänge pro Seite</translation>
+        <translation>6 Tauchgänge pro Seite</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 Tauchgänge pro Seite</translation>
+        <translation>2 Tauchgänge pro Seite</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Tabellendruck</translation>
+        <translation>Tabellendruck</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished">Reihenfolge</translation>
+        <translation>Reihenfolge</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Profil oben</translation>
+        <translation>Profil oben</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Notizen oben</translation>
+        <translation>Notizen oben</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3983,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Bearbeiten</translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">Luft</translation>
+        <translation>Luft</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Notausstieg mit offenem System</translation>
+        <translation>Notausstieg mit offenem System</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> Anfang</translation>
+        <translation> Anfang</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> Ende</translation>
+        <translation> Ende</translation>
     </message>
 </context>
 <context>
@@ -4071,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">unbekannt</translation>
+        <translation>unbekannt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Flasche</translation>
+        <translation>Flasche</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Gasgemisch</translation>
+        <translation>Gasgemisch</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Verw. Gas</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Max. CNS</translation>
+        <translation>Max. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4134,50 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">Luft</translation>
+        <translation>Luft</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Schliessen</translation>
+        <translation>Schliessen</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Ø</translation>
+        <translation>Ø</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished">Min.</translation>
+        <translation>Min.</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished">Max.</translation>
+        <translation>Max.</translation>
     </message>
 </context>
 <context>
@@ -4185,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Neu nummerieren</translation>
+        <translation>Neu nummerieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Neue erste Nummer</translation>
+        <translation>Neue erste Nummer</translation>
     </message>
 </context>
 <context>
@@ -4198,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation>später</translation>
     </message>
 </context>
 <context>
@@ -4226,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Info zu Subsurface</translation>
+        <translation>Info zu Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4254,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Webservice</translation>
+        <translation>Webservice</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Verbindungsfehler: </translation>
+        <translation>Verbindungsfehler: </translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Ungültige Benutzerkennung</translation>
+        <translation>Ungültige Benutzerkennung</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Verstehe die Antwort nicht!</translation>
+        <translation>Verstehe die Antwort nicht!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Erfolgreich geladen!</translation>
+        <translation>Erfolgreich geladen!</translation>
     </message>
 </context>
 <context>
@@ -4292,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
@@ -4323,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -4344,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation>Status:</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation>Passwort</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4382,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Gewicht</translation>
+        <translation>Gewicht</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4401,42 +2031,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">Nr.</translation>
+        <translation>Nr.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4444,7 +2074,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4452,19 +2082,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4472,64 +2102,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">Pa</translation>
+        <translation>Pa</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">cuft</translation>
+        <translation>cuft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">US Pfund</translation>
+        <translation>US Pfund</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) oder (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) oder (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4539,32 +2165,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">Luft</translation>
+        <translation>Luft</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">integriert</translation>
+        <translation>integriert</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">Gürtel</translation>
+        <translation>Gürtel</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">Fussblei</translation>
+        <translation>Fussblei</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">Backplate-Gewicht</translation>
+        <translation>Backplate-Gewicht</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">clip-on</translation>
+        <translation>clip-on</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4574,314 +2200,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Fehler beim Lesen von &apos;%s&apos;</translation>
+        <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">keine</translation>
+        <translation>keine</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">Deko-Stopp</translation>
+        <translation>Deko-Stopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">rbt</translation>
+        <translation>rbt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">Aufstieg</translation>
+        <translation>Aufstieg</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">tiefster Deko-Stopp</translation>
+        <translation>tiefster Deko-Stopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">Arbeit</translation>
+        <translation>Arbeit</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">Sender</translation>
+        <translation>Sender</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">Verletzung</translation>
+        <translation>Verletzung</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">Markierung</translation>
+        <translation>Markierung</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">Oberfläche</translation>
+        <translation>Oberfläche</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">Sicherheitsstopp</translation>
+        <translation>Sicherheitsstopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">Gaswechsel</translation>
+        <translation>Gaswechsel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">Sicherheitsstopp (freiwillig)</translation>
+        <translation>Sicherheitsstopp (freiwillig)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">Sicherheitsstopp (obligatorisch)</translation>
+        <translation>Sicherheitsstopp (obligatorisch)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">Tiefen-Stopp</translation>
+        <translation>Tiefen-Stopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">Sicherheits-Stopp</translation>
+        <translation>Sicherheits-Stopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">Tauchgangsdauer</translation>
+        <translation>Tauchgangsdauer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">Max. Tiefe</translation>
+        <translation>Max. Tiefe</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">OLF</translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO₂</translation>
+        <translation>PO₂</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">verbleibende Atemzeit</translation>
+        <translation>verbleibende Atemzeit</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">Richtung</translation>
+        <translation>Richtung</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">Gewebewarnung</translation>
+        <translation>Gewebewarnung</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">Nullzeit</translation>
+        <translation>Nullzeit</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">ungültige Ereignisnummer</translation>
+        <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Nicht in der Lage, einen Parser für %s %s zu erstellen</translation>
+        <translation>Nicht in der Lage, einen Parser für %s %s zu erstellen</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Fehler beim Registrieren der Daten</translation>
+        <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Fehler beim Lesen des Datums</translation>
+        <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Tauchgang Nr. %d: %s %d %04d</translation>
+        <translation>Tauchgang Nr. %d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Fehler beim Lesen der Dauer</translation>
+        <translation>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Fehler beim Lesen der maximalen Tiefe</translation>
+        <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Fehler beim Lesen der Gasgemischszahl</translation>
+        <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Fehler beim Lesen des Salzgehalts</translation>
+        <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Fehler beim Lesen der Gasgemischs</translation>
+        <translation>Fehler beim Lesen der Gasgemischs</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Fehler beim Lesen der Samples</translation>
+        <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Ereignis: warte auf Benutzeraktion</translation>
+        <translation>Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
+        <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Fehler beim Registrieren der Ereignisbehandlung</translation>
+        <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Fehler bei der Registrierung der Abbruchbehandlung</translation>
+        <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Fehler beim Importieren der Tauchgangsdaten</translation>
+        <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">Fehler beim Erzeugen des libdivecomputer Contexts</translation>
+        <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Fehler beim Öffnen von %s %s (%s)</translation>
+        <translation>Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Unverständliche Prozentangabe %s
+        <translation>Unverständliche Prozentangabe %s
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Fehler beim Lesen von &apos;%s&apos;.
+        <translation>Fehler beim Lesen von &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Fehler beim Lesen von &apos;%s&apos;</translation>
+        <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished">Datenbank Anfrage der Events fehlgeschlagen.
+        <translation>Datenbank Anfrage der Events fehlgeschlagen.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished">Datenbank Verbindung fehlgeschlagen &apos;%s&apos;.
+        <translation>Datenbank Verbindung fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished">Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
+        <translation>Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">Fehler beim Öffnen des Styleshhets (%s)/%s</translation>
+        <translation>Fehler beim Öffnen des Styleshhets (%s)/%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Kann Gasgemisch %d/%d nicht finden</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Flasche für Tauchplanung</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simulierter Tauchgang</translation>
+        <translation>Kann Gasgemisch %d/%d nicht finden</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">Zu viele Gasgemische</translation>
+        <translation>Zu viele Gasgemische</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4890,7 +2508,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Subsurface Tauchplan
 basierend auf GFlow = %.0f und GFhigh = %.0f
 
@@ -4900,166 +2518,162 @@ basierend auf GFlow = %.0f und GFhigh = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Auftauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s
+        <translation>Auftauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s
+        <translation>Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Gaswechsel zu %s
+        <translation>Gaswechsel zu %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Gasverbrauch:
+        <translation>Gasverbrauch:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s %s
+        <translation>%.0f%s %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">T:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 D:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Berechneter tiefster Deko-Stopp %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Sicherheitsstopp:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Sicherheitsstopp:unbk Zeit @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deko:unbk Zeit @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 In Deko</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
@@ -5068,7 +2682,7 @@ MOD:%d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 EAD:%d%s
 END:%d%s
 EADD:%d%s</translation>
@@ -5077,352 +2691,336 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation>C</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation>F</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">ungültig</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">Boot</translation>
+        <translation>Boot</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">Ufer</translation>
+        <translation>Ufer</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished">Strömung</translation>
+        <translation>Strömung</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">Tief</translation>
+        <translation>Tief</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">Kaverne</translation>
+        <translation>Kaverne</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">Eis</translation>
+        <translation>Eis</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">Wrack</translation>
+        <translation>Wrack</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">Höhle</translation>
+        <translation>Höhle</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">Berg</translation>
+        <translation>Berg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">Pool</translation>
+        <translation>Pool</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">See</translation>
+        <translation>See</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">Fluss</translation>
+        <translation>Fluss</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">Nacht</translation>
+        <translation>Nacht</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">Süsswasser</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">Übung</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">Unterricht</translation>
+        <translation>Schüler</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">Foto</translation>
+        <translation>Foto</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">Video</translation>
+        <translation>Video</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation>Instruktor</translation>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">deko</translation>
+        <translation>deko</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">mehr als %d Tage</translation>
+        <translation>mehr als %d Tage</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dd %dh %dmin</translation>
+        <translation>%dd %dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dh %dmin</translation>
+        <translation>%dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">für Tauchgänge Nr.</translation>
+        <translation>für Tauchgänge Nr.</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">für die ausgewählten Tauchgänge</translation>
+        <translation>für die ausgewählten Tauchgänge</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">für Tauchgang Nr. %d</translation>
+        <translation>für Tauchgang Nr. %d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">für den ausgewählten Tauchgang</translation>
+        <translation>für den ausgewählten Tauchgang</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">für alle Tauchgänge</translation>
+        <translation>für alle Tauchgänge</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(keine Tauchgänge)</translation>
+        <translation>(keine Tauchgänge)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">So</translation>
+        <translation>So</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">Mo</translation>
+        <translation>Mo</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">Di</translation>
+        <translation>Di</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">Mi</translation>
+        <translation>Mi</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">Do</translation>
+        <translation>Do</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">Fr</translation>
+        <translation>Fr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">Sa</translation>
+        <translation>Sa</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">Jan</translation>
+        <translation>Jan</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">Feb</translation>
+        <translation>Feb</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">Mär</translation>
+        <translation>Mär</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">Apr</translation>
+        <translation>Apr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">Mai</translation>
+        <translation>Mai</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">Jun</translation>
+        <translation>Jun</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">Jul</translation>
+        <translation>Jul</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">Aug</translation>
+        <translation>Aug</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">Sep</translation>
+        <translation>Sep</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">Okt</translation>
+        <translation>Okt</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">Nov</translation>
+        <translation>Nov</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">Dez</translation>
+        <translation>Dez</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zürich: Dateisystem beinahe voll
+        <translation>Uemis Zürich: Dateisystem beinahe voll
 Bitte den Tauchcomputer ausstecken, wieder einstecken
 und erneut versuchen</translation>
     </message>
@@ -5431,7 +3029,7 @@ und erneut versuchen</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zürich: Dateisystem voll.
+        <translation>Uemis Zürich: Dateisystem voll.
 Bitte den Tauchcomputer ausstecken, wieder einstecken
 und erneut versuchen</translation>
     </message>
@@ -5439,193 +3037,193 @@ und erneut versuchen</translation>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Unvollständiger Schreibvorgang der req.txt Datei
+        <translation>Unvollständiger Schreibvorgang der req.txt Datei
 Ist der Uemis Zürich korrekt verbunden?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">unbekannt</translation>
+        <translation>unbekannt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Lese %s %s</translation>
+        <translation>Lese %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">Daten</translation>
+        <translation>Daten</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">Logbucheintrag mit ID</translation>
+        <translation>Logbucheintrag mit ID</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">Tauchplatz Daten ID</translation>
+        <translation>Tauchplatz Daten ID</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">mehr Daten für Tauchgang ID</translation>
+        <translation>mehr Daten für Tauchgang ID</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">Nass-Tauchanzug</translation>
+        <translation>Nass-Tauchanzug</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">halbtrocken</translation>
+        <translation>halbtrocken</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">Trockentauchanzug</translation>
+        <translation>Trockentauchanzug</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">Shorty</translation>
+        <translation>Shorty</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">Weste</translation>
+        <translation>Weste</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">Latzhose</translation>
+        <translation>Latzhose</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">Jacke</translation>
+        <translation>Jacke</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">vollständiger Tauchanzug</translation>
+        <translation>vollständiger Tauchanzug</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">Zweiteiler</translation>
+        <translation>Zweiteiler</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">Membran</translation>
+        <translation>Membran</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Verbindung aufbauen</translation>
+        <translation>Verbindung aufbauen</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Uemis-Initialisierung fehlgeschlagen</translation>
+        <translation>Uemis-Initialisierung fehlgeschlagen</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Beginne zu Laden</translation>
+        <translation>Beginne zu Laden</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Verletzung des Sicherheitsstopps</translation>
+        <translation>Verletzung des Sicherheitsstopps</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Alarm: Geschwindigkeit</translation>
+        <translation>Alarm: Geschwindigkeit</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Warnung: Geschwindigkeit</translation>
+        <translation>Warnung: Geschwindigkeit</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Warnung: PO₂ Grün</translation>
+        <translation>Warnung: PO₂ Grün</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Warnung: Aufstieg / PO₂</translation>
+        <translation>Warnung: Aufstieg / PO₂</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Alarm: Aufstieg / PO₂</translation>
+        <translation>Alarm: Aufstieg / PO₂</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Info: Flaschendruck</translation>
+        <translation>Info: Flaschendruck</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Warnung: verbleibende Gas-Zeit</translation>
+        <translation>Warnung: verbleibende Gas-Zeit</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Alarm: verbleibende Gas-Zeit</translation>
+        <translation>Alarm: verbleibende Gas-Zeit</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Gaswechsel-Vorschlag</translation>
+        <translation>Gaswechsel-Vorschlag</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Tiefenlimit überschritten</translation>
+        <translation>Tiefenlimit überschritten</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Warnung: Maximale Deko Zeit</translation>
+        <translation>Warnung: Maximale Deko Zeit</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Info: Tauchgangsdauer</translation>
+        <translation>Info: Tauchgangsdauer</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Alarm: Tauchgangsdauer</translation>
+        <translation>Alarm: Tauchgangsdauer</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Markierung</translation>
+        <translation>Markierung</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Keine Flaschen Informationen</translation>
+        <translation>Keine Flaschen Informationen</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Warnung: Batterie schwach</translation>
+        <translation>Warnung: Batterie schwach</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Alarm: Batterie schwach</translation>
+        <translation>Alarm: Batterie schwach</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index 6bd538c25..c0a7d1299 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -1,2389 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-Keine Ereignisse
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete"> &gt; Monat</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete"> herunterladen</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete"> Bitte Tauchcomputer und Anschluß auswählen. </translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> Anfang</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> Ende</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">Nr.</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s%2$s %4$d. %3$s %5$d   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d   %5$dh%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dt %dst %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dst %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-Berechneter tiefster Deko-Stopp %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deko:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deko:unbk Zeit @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-In Deko</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL:%umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-D:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Sicherheitsstopp:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Sicherheitsstopp:unbk Zeit @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Subsurface Tauchplan
-basierend auf GFlow = %.0f und GFhigh = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s event at %d:%02u</source>
-        <translation type="obsolete">%s Ereignis (%d:%02u)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s: Response from divelogs.de</source>
-        <translation type="obsolete">%s: Antwort von divelogs.de</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) oder (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(um Datum/Zeit zu bearbeiten hier klicken)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(um Datum/Zeit/Tiefe zu bearbeiten hier klicken)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(keine Tauchgänge)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(nichts)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 cu.ft./min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 cu.ft./min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 l/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 Tauchgänge pro Seite</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">Zweiteiler</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 l/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">3m Stufen für berechnete Deko-Stopps</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 Tauchgänge pro Seite</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;Add segments below.
-Each line describes part of the planned dive.
-An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. &apos;+3:30&apos;) or ends at the given time (if absolute e.g &apos;@5:00&apos;, &apos;runtime&apos;), and uses the given gas.
-An empty gas means &apos;use previous gas&apos; (or AIR if no gas was specified).
-An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.
-CC SetPoint specifies CC (rebreather) dives, leave empty for OC.&lt;/small&gt;
-</source>
-        <translation type="obsolete">&lt;small&gt;Abschnitte des Tauchgangs hier hinzufügen.
-Jede Zeile beschreibt einen Teil des geplanten Tauchgangs.
-Ein Eintrag mit Tiefe, Dauer und Gas bestimmt einen Abschnitt der auf der angegebenen Tiefe endet, die angegebene Dauer hat (oder zur angegebenen Zeit endet, wenn relativ definiert: &apos;+3:30&apos;, wenn absolut definiert: &apos;@5:00&apos;) und das angegebene Gas benutzt.
-Ein leerer Eintrag für Gas bedeutet &quot;benutze das vorherige Gas&quot; (oder LUFT falls kein Gas spezifiziert war).
-Ein Eintrag der eine Tiefe und ein Gas angibt, aber keine Dauer ist ein Hinweis für den Algorithmus, dass beim Aufstieg auf dieser Tiefe ein Wechsel zum angegebenen Gas geplant ist.
-CC SetPoint ist für Tauchgänge mit Kreislaufgeräten gedacht, bitte für Tauchgänge mit traditioneller Ausrüstung leer lassen..&lt;/small&gt;
-</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">Luft</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">Info zu Subsurface</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Setze</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Tauchgang hinzufügen...</translation>
-    </message>
-    <message>
-        <source>Add bookmark event here</source>
-        <translation type="obsolete">Markierung hier setzen</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Tauchgang hinzufügen</translation>
-    </message>
-    <message>
-        <source>Add gas change event here</source>
-        <translation type="obsolete">Gaswechsel hier setzen</translation>
-    </message>
-    <message>
-        <source>Add gaschange event at %d:%02u</source>
-        <translation type="obsolete">Gaswechsel setzen bei %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Zur obigen Reise hinzufügen</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Weiteren Abschnitt hinzufügen</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Luftdruck</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Lufttemp.</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Lufttemp. in %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Immer heruntergeladene Tauchgänge bevorzugen</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">Apr</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">Aug</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Automatisch gruppieren</translation>
-    </message>
-    <message>
-        <source>Available gases</source>
-        <translation type="obsolete">Verfügbare Gase</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Ø Tiefe</translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Ø Tiefe (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">Ø AMV</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Ø Temp</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Ø Dauer</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Notausstieg mit offenem System</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Partner</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CC SetPoint</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Kann Gasgemisch %d/%d nicht finden</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">Fehler beim Öffnen des Styleshhets (%s)/%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Abgebrochen, beende...</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Abgebrochen...</translation>
-    </message>
-    <message>
-        <source>Cannot add gas change</source>
-        <translation type="obsolete">Kann keinen Gaswechsel setzen</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Verstehe die Antwort nicht!</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Celsius</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Standard XML-Datei auswählen</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Bitte XML-Dateien auswählen, die in die aktuelle Datei eingefügt werden sollen</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Schließen</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Alle einfalten</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Verbinde...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Verbindungsfehler: </translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Neue Reise darüber einfügen</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">cuft</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Flasche</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Flasche</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Flasche für Tauchplanung</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Flaschen</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">HAFTUNGSAUSSCHLUSS / WARNUNG: DIES IST EINE NEUE IMPLEMENTIERUNG DES &quot;BÜHLMANN ZH-L16&quot;-ALGORITHMUS UND EINES DARAUF AUFBAUENDEN TAUCHGANGPLANERS, 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>
-        <source>Database connection failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Datenbank Verbindung fehlgeschlagen &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query get_events failed.
-</source>
-        <translation type="obsolete">Datenbank Anfrage &apos;get_events&apos; fehlgeschlagen.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Datum und Zeit</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Datum:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">Dez</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">Standard XML Datei</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Lösche die Informationen zu einem Tauchcomputer</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Tauchgang löschen</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Tauchgänge löschen</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Tiefe</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Tiefenbegrenzung überschritten</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Tiefe:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Gerätebezeichnung</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Gerät oder Mount-Point</translation>
-    </message>
-    <message>
-        <source>Display invalid dives</source>
-        <translation type="obsolete">Ungültige Tauchgänge anzeigen</translation>
-    </message>
-    <message>
-        <source>Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</source>
-        <extracomment>++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-&lt;trailing text&gt;
-</extracomment>
-        <translation type="obsolete">Tauchgang #%1$d - %2$s %4$02d.%3$02d.%5$04d um %6$d:%7$02d %8$s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Tauchgang #%d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Tauchgang Nr. %d: %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Bezeichnung für den Tauchcomputer</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Informationen</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Notizen</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Tauchplan - DIES IST NUR EINE SIMULATION; NICHT ZUM TAUCHEN VERWENDEN</translation>
-    </message>
-    <message>
-        <source>Dive Tags</source>
-        <translation type="obsolete">Tauchgangs-Typ</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Dauer</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Alarm: Tauchgangsdauer</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Info: Tauchgangsdauer</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Hersteller und Modell</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Fehler beim Importieren der Tauchgangsdaten</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Tauchplätze</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Tauchgruppenleiter</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Wann beginnt der Tauchgang?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Tauchgang Nr.</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Schriftart für Tauchliste</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Tauchgruppenleiter</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Tauchgänge</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Tauchplätze</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Von Tauchcomputer laden</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Von Tauchcomputer laden...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Vom Webserver laden</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Vom Webserver laden...</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Erfolgreich geladen!</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Dauer</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Dauer (min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">O</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Gerätename bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Tauchcomputer Bezeichnung bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Reise-Informationen bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Reise-Übersicht bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Der Name des Tauchcomputers kann durch Doppelklick bearbeitet werden</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Tauchgang bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Zeit des Tauchgangs bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Tauchgänge bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Mehrere Tauchgänge bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Reise-Übersicht bearbeiten</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Ereignisse Ein-/Ausblenden</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Tags</source>
-        <translation type="obsolete">An- / Abwählen von Tauchgangs-Typen</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Ende</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Tiefe am Ende</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Benutzerkennung eingeben und &apos;Laden&apos; drücken. Bei Erfolg &apos;Anwenden&apos; drücken um die Daten zu übernehmen.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Ausrüstung</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Fehler</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Fehler beim Lesen des Salzgehalts</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Fehler beim Lesen des Datums</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Fehler beim Lesen der Dauer</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Fehler beim Lesen der Gasgemischs</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Fehler beim Lesen der Gasgemischszahl</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Fehler beim Lesen der maximalen Tiefe</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Fehler beim Lesen der Samples</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Fehler bei der Registrierung der Abbruchbehandlung</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Fehler beim Registrieren der Daten</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Fehler beim Registrieren der Ereignisbehandlung</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Ereignis: systime=%&lt;PRId64&gt;, devtime=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Ereignis: warte auf Benutzeraktion</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Alle ausfalten</translation>
-    </message>
-    <message>
-        <source>Export As UDDF File</source>
-        <translation type="obsolete">Als UDDF Datei exportieren</translation>
-    </message>
-    <message>
-        <source>Export UDDF...</source>
-        <translation type="obsolete">UDDF Exportieren...</translation>
-    </message>
-    <message>
-        <source>Export dive(s) to UDDF</source>
-        <translation type="obsolete">Tauchgang(gänge) als UDDF exportieren</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Fehler beim Öffnen von %i Dateien</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Fehler beim Lesen von &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Fehler beim Lesen von &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Fehler beim Lesen von &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Fehler beim Lesen von &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">Feb</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">Fuß</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Datei</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filter</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">(Erneutes) Laden aller Tauchgänge erzwingen</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Fr</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFhigh</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFhigh für Tauchplan</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFlow</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFlow für Tauchplan</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (WGS84 oder GPS Format)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Gasverbrauch</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Gasverbrauch</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Verw. Gas</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Gasverbrauch:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Gasgemisch</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Allg. Einstellungen</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Hilfe</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">inaktiv</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Datei(en) importieren...</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Informationen</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Verbindung aufbauen</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Plan eingeben</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Ungültige Tiefe - kann &quot;%s&quot; nicht lesen</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Ungültige Tiefe - Werte unterhalb 400m sind nicht unterstützt</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Ungültiges Gasgemisch in Zeile %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Ungültige Anfangszeit</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Ungültige Benutzerkennung</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Jan</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">Jul</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">Jun</translation>
-    </message>
-    <message>
-        <source>Last stop at 20 Feet</source>
-        <translation type="obsolete">Letzter Stopp auf 20 Fuß</translation>
-    </message>
-    <message>
-        <source>Last stop at 6 Meters</source>
-        <translation type="obsolete">Letzter Stopp auf 6 Metern</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Layout Einstellungen</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel und andere, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Liste</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">Liter</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Ort</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Max.</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Längster Tauchgang</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Alarm: Batterie schwach</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Warnung: Batterie schwach</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Karten-Anbieter</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">Mär</translation>
-    </message>
-    <message>
-        <source>Mark invalid</source>
-        <translation type="obsolete">Als ungültig markieren</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Hier markieren</translation>
-    </message>
-    <message>
-        <source>Mark valid</source>
-        <translation type="obsolete">Als gültig markieren</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Markierung</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Leiter</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Warnung: Maximale Deko Zeit</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Max. Tiefe</translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Max. Tiefe (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Max. AMV</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Max. Temp.</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Max. Tiefe: %.*f %s
-Dauer: %d min
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Max. CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Max. Druck</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Max.</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Max.</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Max.</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">Mai</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Tauchgänge zusammenführen</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Reise mit der darüber verbinden</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Reise mit der darunter verbinden</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">Meter</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Min. Tiefe</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Min. AMV</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Min. Temp.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Min.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Min.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Min.</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Verschiedene Optionen</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Modell</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Mo</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Multi-Plattform Tauchprogramm in C</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Neue erste Nummer</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Nächster TC</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Gerätename</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Keine Flaschen Informationen</translation>
-    </message>
-    <message>
-        <source>No cylinders listed for this dive.</source>
-        <translation type="obsolete">Keine Flaschen für diesen Tauchgang</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notizen</translation>
-    </message>
-    <message>
-        <source>Notes height (%d%% - %d%%)</source>
-        <translation type="obsolete">Höhe der Notizen (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Notizen oben</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">Nov</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">OLF</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">Okt</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Unbekannter pthread Fehlercode</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Ausgewählten Eintrag löschen?</translation>
-    </message>
-    <message>
-        <source>Only display dives with these tags:</source>
-        <translation type="obsolete">Nur Tauchgänge dieses Typs anzeigen:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Datei öffnen</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Öffnen...</translation>
-    </message>
-    <message>
-        <source>Ordering</source>
-        <translation type="obsolete">Reihenfolge</translation>
-    </message>
-    <message>
-        <source>Other data height (%d%% - %d%%)</source>
-        <translation type="obsolete">Höhe der anderen Daten (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Sauerstoff</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Alarm: Aufstieg / PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Warnung: Aufstieg / PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Warnung: PO2 Grün</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Auf Karte auswählen</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Planer</translation>
-    </message>
-    <message>
-        <source>Please enter your userid and password for divelogs.de. The selected dives will be added to your account</source>
-        <translation type="obsolete">Bitte Benutzerkennung und Passwort für divelogs.de eingeben. Die ausgewählten Tauchgänge werden zum Benutzerkonto hinzugefügt.</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Einstellungen</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Einstellungen...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Druck</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Druck:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Vorh. TC</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">Farbdruck</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Nur ausgewählte Tauchgänge drucken</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Auswahl drucken</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Art des Ausdrucks</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Drucken...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Profil</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Profil Einstellungen</translation>
-    </message>
-    <message>
-        <source>Profile height (%d%% - %d%%)</source>
-        <translation type="obsolete">Höhe des Profils (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Profil oben</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Beenden</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Alarm: verbleibende Gas-Zeit</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Warnung: verbleibende Gas-Zeit</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Bewertung</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Lese %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Entferne</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Reise entfernen</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Tauchgang aus Reise entfernen</translation>
-    </message>
-    <message>
-        <source>Remove event here</source>
-        <translation type="obsolete">Entferne Ereignisse hier</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Ausgewählte Tauchgänge aus Reise entfernen</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Neu nummerieren</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Neu nummerieren...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Wiederholen</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">AMV</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">AMV während Dekostopp</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">AMV während des Tauchgangs</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Verletzung des Sicherheitsstopps</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sa</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Speichern unter...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Änderungen speichern?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Datei speichern unter</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Speichern unter</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Speichern...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Segment Dauer</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Ereignisse auswählen</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Ereignisse auswählen...</translation>
-    </message>
-    <message>
-        <source>Select Tags...</source>
-        <translation type="obsolete">Typen auswählen...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">Sep</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Unvollständiger Schreibvorgang der req.txt Datei
-Ist der Uemis Zürich korrekt verbunden?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Min.</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Kürzester Tauchgang</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Spalten anzeigen</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">EAD, END, EADD anzeigen</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">MOD anzeigen</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Berechnete tiefste Deko-Stopps anzeigen</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Vom TC ausgelesene tiefste Deko-Stopps rot anzeigen</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Auf Karte zeigen</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">pHe Diagramm anzeigen</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">pN%s Diagramm anzeigen</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">pO%s Diagramm anzeigen</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simulierter Tauchgang</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Größe</translation>
-    </message>
-    <message>
-        <source>Sizing heights (%% of layout)</source>
-        <translation type="obsolete">Höhe (%% des Layouts)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Alarm: Geschwindigkeit</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Warnung: Geschwindigkeit</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Start</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Beginne zu Laden</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Statistiken</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Statistiken %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Statistiken</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Status</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Unverständliche Prozentangabe %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Anzug</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">So</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Oberflächenpause</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Oberflächendruck (mbar)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Gaswechsel zu %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Tabellendruck</translation>
-    </message>
-    <message>
-        <source>Tags are only shown if they are identical for all edited dives</source>
-        <translation type="obsolete">Tauchgang-Typen werden nur angezeigt, wenn sie in allen editierten Tauchgängen identisch waren</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Gaswechsel-Vorschlag</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Info: Flaschendruck</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Tec-Einstellungen</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Temperatur</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Temperatur</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Temperatur:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Drei</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Zeit</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Zum Tauchgangsdaten bearbeiten
-Doppelklick in der Tauchgangsliste</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zoom ein-/ausschalten</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">Zu viele Gasgemische</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">Zu viele Abschnitte</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Gesamt</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Gesamtzeit</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Gesamtgewicht:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Tauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgang)</numerusform>
-            <numerusform>Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgänge)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Typ</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zürich: Dateisystem beinahe voll
-Bitte den Tauchcomputer ausstecken, wieder einstecken
-und erneut versuchen</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zürich: Dateisystem voll.
-Bitte den Tauchcomputer ausstecken, wieder einstecken
-und erneut versuchen</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Uemis-Initialisierung fehlgeschlagen</translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">Fehler beim Erzeugen des libdivecomputer Contexts</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Nicht in der Lage, einen Parser für %s %s zu erstellen</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Fehler beim Öffnen von %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Einheiten</translation>
-    </message>
-    <message>
-        <source>Upload dive(s) to divelogs.de</source>
-        <translation type="obsolete">Tauchgang(gänge) auf divelogs.de hochladen</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de</source>
-        <translation type="obsolete">Auf divelogs.de hochladen</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de...</source>
-        <translation type="obsolete">Hochladen auf divelogs.de...</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Der Tauchplatz kann mittels rechter Maustaste an der Mausposition markiert werden</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Benutzerkennung</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Benutzerhandbuch</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Ansicht</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Sicht</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Volumen:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">W</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Warnung - extrem lange Tauchgänge können zu sehr langen Berechnungszeiten führen</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Warnung - extrem tiefe Tauchgänge können zu sehr langen Berechnungszeiten führen</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Wassertemperatur</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Webservice</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mi</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Gewicht</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Gewichtsystem</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Gewicht:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">XML-Datei</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Jahr</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Jahresstatistiken</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">Sie haben bereits einen Tauchcomputer dieses Modells
-mit Namen %s.
-Subsurface kann einen Namen für dieses Gerät verwalten, um die Geräte zu unterscheiden. Die Voreinstellung ist unten angezeigt.
-Falls kein Name gewünscht ist, bitte &apos;Abbrechen&apos; klicken. Subsurface zeigt dann einfach den Produktnamen an (in diesem Fall können eventuell verschiedene Tauchcomputer nicht mehr in den angezeigten Daten unterschieden werden).</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Nicht alle Änderungen wurden gespeichert.
-Sollen Änderungen vor dem Schließen der Datei gespeichert werden?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Nicht alle Änderungen in der Datei %s wurden gespeichert.
-Sollen Änderungen vor dem Schließen der Datei gespeichert werden?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">Luft</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">verbleibende Atemzeit</translation>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">Berg</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">Fußblei</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">Aufstieg</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">Backplate-Gewicht</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">Gürtel</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">Boot</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">Markierung</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">Höhle</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">Kaverne</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">tiefster Deko-Stopp</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">Sicherheits-Stopp</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">clip-on</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">cu.ft.</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">Daten</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">deko</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">Deko-Stopp</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">tief</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">Tiefen-Stopp</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">Logbucheintrag mit ID</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">Tauchplatz Daten ID</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">Tauchgangsdauer</translation>
-    </message>
-    <message>
-        <source>drift</source>
-        <translation type="obsolete">Strömung</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">Trockentauchanzug</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">für alle Tauchgänge</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">für Tauchgang Nr. %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">für Tauchgänge Nr.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">für den ausgewählten Tauchgang</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">für die ausgewählten Tauchgänge</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">Süsswasser</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">ft</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">vollständiger Tauchanzug</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">Gaswechsel</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">Richtung</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">Eis</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">integriert</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">ungültig</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">ungültige Ereignisnummer</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">Jacke</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">See</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">US Pfund</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">Latzhose</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">max. ppO2</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">max. CNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">Max. Tiefe</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">Membran</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">min</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">mehr Daten für Tauchgang ID</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">mehr als %d Tage</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">Nacht</translation>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">Nullzeit</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">keine</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">pHe Schwelle</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">pN%s Schwelle</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">pO%s Schwelle</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">Pa</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">Foto</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">Pool</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">rbt</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">Fluss</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">Sicherheitsstopp</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">Sicherheitsstopp (verpflichtend)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">Sicherheitsstopp (freiwillig)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">halbtrocken</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">Ufer</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">Shorty</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">Oberfläche</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">Lehr</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">Gewebewarnung</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">Übung</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">Dirk Hohndel</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">Sender</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">unbk</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">unbekannt</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">nicht angegeben</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">Weste</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">Video</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">Verletzung</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">Blei</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">Nass-Tauchanzug</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">Arbeit</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">Wrack</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei importieren (CSV)</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Feld Trenner</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Feldkonfiguration</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Zeit</translation>
+        <translation>Zeit</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Tiefe</translation>
+        <translation>Tiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Temperatur</translation>
+        <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation>CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation>Stopptiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorkonfigurierte Importe</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation>CSV Log Datei öffnen</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation>CSV Dateien (*.csv)</translation>
     </message>
 </context>
 <context>
@@ -2391,57 +77,57 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Größe</translation>
+        <translation>Größe</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation>max. Fülldruck</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Druck vorh.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Druck nachh.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation>O2%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation>HE</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation>Wechsel bei</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken entfernt diese Flasche.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation>Flasche kann nicht entfernt werden</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation>
     </message>
 </context>
 <context>
@@ -2449,41 +135,41 @@ tranlators here
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Tauchcomputer Bezeichnung bearbeiten</translation>
+        <translation>Tauchcomputer Bezeichnung bearbeiten</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählten Tauchcomputer entfernen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tauchcomputer wirklich entfernen?</translation>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Modell</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Modell</translation>
+        <source>Device ID</source>
+        <translation>Gerätebezeichnung</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Gerätename</translation>
+        <translation>Gerätename</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken entfernt diesen Tauchcomputer.</translation>
     </message>
 </context>
 <context>
@@ -2491,12 +177,12 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation>l/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation>cuft/min</translation>
     </message>
 </context>
 <context>
@@ -2504,95 +190,87 @@ tranlators here
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation>Suchfeld anzeigen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle ausklappen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle einklappen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation>Andere einklappen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation>Entferne Tauchgang aus Reise</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation>Tauchgäng(e) zum Trip darüber hinzufügen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation>Reise mit der Reise darüber verbinden</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation>Reise mit der Reise darunter verbinden</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tauchgang löschen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichern unter</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation>Als UDDF exportieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeiten verschieben</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichere Tauchgänge als...</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei speichern als</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Reise mit der darüber verbinden</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Reise mit der darunter verbinden</translation>
+        <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
 </context>
 <context>
@@ -2600,48 +278,48 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation>AMV</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Deko-AMV</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation>GF high</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation>GF low</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Startzeit</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Oberflächendruck</translation>
     </message>
 </context>
 <context>
@@ -2649,23 +327,24 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation>10m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation>30ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Einer oder mehrere Deiner Stopps werden hierdurch verloren gehen.
+Bitte entferne diese zuerst.</translation>
     </message>
 </context>
 <context>
@@ -2673,37 +352,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">Luft</translation>
+        <translation>Luft</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Endtiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Dauer</translation>
+        <translation>Dauer</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation>Gasverbrauch</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation>CC Set Point</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation>Plan verwerfen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation>Du bist dabei Deinen Plan zu verwerfen.</translation>
     </message>
 </context>
 <context>
@@ -2711,17 +390,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation>Planerpunkte</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation>Verfügbare Gase</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation>Datenpunkt hinzufügen</translation>
     </message>
 </context>
 <context>
@@ -2729,67 +408,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">Nr.</translation>
+        <translation>Nr.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">min</translation>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">US Pfund</translation>
+        <translation>US Pfund</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Anzug</translation>
+        <translation>Anzug</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Flasche</translation>
+        <translation>Flasche</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">AMV</translation>
+        <translation>AMV</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">max. CNS</translation>
+        <translation>max. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Ort</translation>
+        <translation>Ort</translation>
     </message>
 </context>
 <context>
@@ -2798,17 +477,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Fehler</translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Wiederholen</translation>
+        <translation>Wiederholen</translation>
     </message>
 </context>
 <context>
@@ -2816,47 +495,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Von Tauchcomputer laden</translation>
+        <translation>Von Tauchcomputer laden</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation>Hersteller</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Tauchcomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerät oder Mount-Point</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">(Erneutes) Laden aller Tauchgänge erzwingen</translation>
+        <translation>Erneutes Laden aller Tauchgänge erzwingen</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation>Heruntergeladene Tauchgänge immer bevorzugen</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -2864,225 +543,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Notizen</translation>
+        <translation>Notizen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation>Anfangszeit</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation>Luft- / Wassertemperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Ort</translation>
+        <translation>Ort</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation>Koordinaten</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Tauchgruppenleiter</translation>
+        <translation>Tauchgruppenleiter</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Partner</translation>
+        <translation>Partner</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation>Stichworte</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Bewertung</translation>
+        <translation>Bewertung</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Sicht</translation>
+        <translation>Sicht</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Anzug</translation>
+        <translation>Anzug</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Notizen</translation>
+        <translation>Notizen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Ausrüstung</translation>
+        <translation>Ausrüstung</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Informationen</translation>
+        <translation>Informationen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation>Intervall</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Verw. Gase</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbrauchtes Gas</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">AMV</translation>
+        <translation>AMV</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Max. Tiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Ø Tiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Luftdruck</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Lufttemperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Wassertemperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Dauer</translation>
+        <translation>Dauer</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation>Salzgehalt</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Statistiken</translation>
+        <translation>Statistiken</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Tiefe</translation>
+        <translation>Tiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatur</translation>
+        <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Dauer</translation>
+        <translation>Dauer</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Gesamtzeit</translation>
+        <translation>Gesamtzeit</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Tauchgänge</translation>
+        <translation>Tauchgänge</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Flaschen</translation>
+        <translation>Flaschen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Flasche hinzufügen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation>Gewichte</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation>Gewichtsystem hinzufügen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Reise Ort</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Reise Notizen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Reise wird bearbeitet. Drücke Speichern oder Abbrechen, wenn Du fertig bist.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mehrere Tauchgänge werden bearbeitet. Drücke Speichern oder Abbrechen, wenn Du fertig bist.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieser Tauchgang wird bearbeitet. Drücke Speichern oder Abbrechen, wenn Du fertig bist.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -3091,32 +770,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation>/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">unbekannt</translation>
+        <translation>unbekannt</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">O</translation>
+        <translation>O</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">W</translation>
+        <translation>W</translation>
     </message>
 </context>
 <context>
@@ -3124,417 +803,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Datei</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Ansicht</translation>
+        <translation>Hauptfenster</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Hilfe</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Datei</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Log</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ansicht</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Importieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Neues Logbuch</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Neu</translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+N</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Logbuch &amp;öffnen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffnen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+O</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Speichern</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichern</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Speichern unter</translation>
+        <translation>Speichern unter</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+Shift+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Schließen</translation>
+        <translation>Schließen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+W</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien importieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+I</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportiere &amp;UDDF</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+U</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Drucken</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+,</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Beenden</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Von &amp;Tauchcomputer importieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;GPS Daten vom Subsurface Service importieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+G</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerätenamen &amp;bearbeiten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg++</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Neu nummerieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+R</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zoom ein-/ausschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Jahresstatistiken</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+Y</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation>Tauchgangliste</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Profil</translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Informationen</translation>
+        <translation>Informationen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Bedienungsanleitung</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation>Globus</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation>Tauchgang p&amp;lanen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+L</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation>CSV importieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation>CS&amp;V importieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation>von Divelogs.de importieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+P</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Einstellungen</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Beenden</translation>
+        <translation>Einstellungen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+Q</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Gerätename bearbeiten</translation>
+        <translation>Strg+D</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Neu nummerieren</translation>
+        <translation>Tauchgang hinzufügen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zoom ein-/ausschalten</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Jahresstatistiken</translation>
+        <translation>automatisch gruppieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+2</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+3</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+4</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Vorh. TC</translation>
+        <translation>Vorh. TC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Links</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Nächster TC</translation>
+        <translation>Nächster TC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechts</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Ereignisse auswählen</translation>
+        <translation>Ereignisse auswählen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Plan eingeben</translation>
+        <translation>Plan eingeben</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Info zu Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Benutzerhandbuch</translation>
+        <translation>Info zu Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation>F1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+5</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Datei öffnen</translation>
+        <translation>Datei öffnen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann das Subsurface Handbuch nicht finden</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchtest Du die Änderungen in der Daten-Datei speichern?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Änderungen speichern?</translation>
+        <translation>Änderungen speichern?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Änderungen gehen verloren wenn Du sie nicht speicherst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei speichern als</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3544,17 +1183,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Warnung</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -3562,289 +1201,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardeinstellungen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Einheiten</translation>
+        <translation>Einheiten</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation>Diagramm</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation>Listen und Tabellen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Schriftart</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation>Schriftgröße</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Tauchgänge</translation>
+        <translation>Tauchgänge</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard Tauch Datei</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzeige ungültig</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard Flasche</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutze Standard Flasche</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation>System</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation>Metrisch</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation>Imperial</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation>Personalisieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Tiefe</translation>
+        <translation>Tiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">Meter</translation>
+        <translation>Meter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">Fuß</translation>
+        <translation>Fuß</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Druck</translation>
+        <translation>Druck</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation>Psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Volumen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">Liter</translation>
+        <translation>Liter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">cuft</translation>
+        <translation>cuft</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatur</translation>
+        <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Celsius</translation>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Fahrenheit</translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Gewicht</translation>
+        <translation>Gewicht</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation>Kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">US Pfund</translation>
+        <translation>US Pfund</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeiteinheiten</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>Minuten</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Sekunden</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzeigen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation>pO2</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation>Schwelle</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation>pN2</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation>pHe</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation>MOD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation>max. pp02</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation>EAD END EADD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation>Auftauchgrenze Tauchcomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation>tiefster Deko-Stopp rot markieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation>Berechnete Auftauchgrenze</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation>alle Gewebe anzeigen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation>3m Inkremente</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation>Null-/Auftauchzeit berechnen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation>AMV anzeigen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation>GF low bei maximaler Tiefe anwenden</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Sonstiges</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation>GF low</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation>GF high</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard Logfile öffnen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -3852,7 +1491,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Drucken</translation>
     </message>
 </context>
 <context>
@@ -3860,37 +1499,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Tauchgang Nr.</translation>
+        <translation>Tauchgang Nr.</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Tiefe</translation>
+        <translation>Tiefe</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Dauer</translation>
+        <translation>Dauer</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Leiter</translation>
+        <translation>Leiter</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Partner</translation>
+        <translation>Partner</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Ort</translation>
+        <translation>Ort</translation>
     </message>
 </context>
 <context>
@@ -3898,84 +1537,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation>Druckoptionen</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Nur ausgewählte Tauchgänge drucken</translation>
+        <translation>Nur ausgewählte Tauchgänge drucken</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">Farbdruck</translation>
+        <translation>Farbdruck</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Art des Ausdrucks</translation>
+        <translation>Art des Ausdrucks</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 Tauchgänge pro Seite</translation>
+        <translation>6 Tauchgänge pro Seite</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 Tauchgänge pro Seite</translation>
+        <translation>2 Tauchgänge pro Seite</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Tabellendruck</translation>
+        <translation>Tabellendruck</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished">Reihenfolge</translation>
+        <translation>Reihenfolge</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Profil oben</translation>
+        <translation>Profil oben</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Notizen oben</translation>
+        <translation>Notizen oben</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Höhe des Profils (43% - 85%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Höhe der Notizen (0% - 52%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation>0</translation>
     </message>
 </context>
 <context>
@@ -3983,87 +1622,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation>Ereignisse ausblenden</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle %1 Ereignisse ausblenden?</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewähltes Ereignis entfernen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 @ %2:%3</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannter Tauchcomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>Setze Dauer: 10 Minuten</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation>Maßstab</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation>Lineal</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation>Eigenschaften der Tauchgangssegmente messen</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation>Tauchgang auf Bildschirmgrößem skalieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Bearbeiten</translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">Luft</translation>
+        <translation>Luft</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation>EAN%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Notausstieg mit offenem System</translation>
+        <translation>Notausstieg mit offenem System</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> Anfang</translation>
+        <translation> Anfang</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> Ende</translation>
+        <translation> Ende</translation>
     </message>
 </context>
 <context>
@@ -4071,62 +1710,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">unbekannt</translation>
+        <translation>unbekannt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Tauchgang Nr %1 - %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>max Tiefe: %1 %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation>Dauer: %1 Minuten</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Flasche</translation>
+        <translation>Flasche</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Gasgemisch</translation>
+        <translation>Gasgemisch</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Verw. Gas</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">AMV</translation>
+        <translation>AMV</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Max. CNS</translation>
+        <translation>Max. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation>Gewichte</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation>Gesamtgewicht</translation>
     </message>
 </context>
 <context>
@@ -4134,50 +1773,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">Luft</translation>
+        <translation>Luft</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation>Diesen Punkt entfernen</translation>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Positionsdaten - Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation>Tauchgang wird editiert - Karte verschieben und Tauchplatz mit Doppelklick markieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Schließen</translation>
+        <translation>Schließen</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Ø</translation>
+        <translation>Ø</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished">Min.</translation>
+        <translation>Min.</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished">Max.</translation>
+        <translation>Max.</translation>
     </message>
 </context>
 <context>
@@ -4185,12 +1816,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Neu nummerieren</translation>
+        <translation>Neu nummerieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Neue erste Nummer</translation>
+        <translation>Neue erste Nummer</translation>
     </message>
 </context>
 <context>
@@ -4198,27 +1829,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählte Zeiten verschieben</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählte Zeiten verschieben um...</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation>früher</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation>später</translation>
     </message>
 </context>
 <context>
@@ -4226,27 +1857,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Info zu Subsurface</translation>
+        <translation>Info zu Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Lizenz</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Webseite</translation>
     </message>
 </context>
 <context>
@@ -4254,37 +1885,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Webservice</translation>
+        <translation>Webservice</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation>Warten Sie ein bisschen, bis wir etwas haben ...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation>Download beendet</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Verbindungsfehler: </translation>
+        <translation>Verbindungsfehler: </translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Ungültige Benutzerkennung</translation>
+        <translation>Ungültige Benutzerkennung</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Verstehe die Antwort nicht!</translation>
+        <translation>Verstehe die Antwort nicht!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Erfolgreich geladen!</translation>
+        <translation>Erfolgreich geladen!</translation>
     </message>
 </context>
 <context>
@@ -4292,30 +1923,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Flasche hinzufügen</translation>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <source>Description</source>
+        <translation>Beschreibung</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
@@ -4323,20 +1954,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Information</translation>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation>Beschreibung</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -4344,37 +1975,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Standortdaten herunterladen</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation>Status:</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier ID eingeben</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Herunterladen</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzer-Kennung</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation>Passwort</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation>Hochladen</translation>
     </message>
 </context>
 <context>
@@ -4382,17 +2013,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Gewicht</translation>
+        <translation>Gewicht</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
 </context>
 <context>
@@ -4401,42 +2032,48 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation>Jahr 
+ &gt; Monat / Trip</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">Nr.</translation>
+        <translation>Nr.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation>Dauer
+Gesamt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Ø</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Kürzester</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Längster</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiefe (%1)
+ Durchschnitt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4444,7 +2081,8 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Minimum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4452,19 +2090,22 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Maximum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>AMV (%1)
+ Durchschnitt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Temp. (%1)
+Mittel</translation>
     </message>
 </context>
 <context>
@@ -4472,64 +2113,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">Pa</translation>
+        <translation>Pa</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">cu.ft.</translation>
+        <translation>cu.ft.</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">US Pfund</translation>
+        <translation>US Pfund</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) oder (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) oder (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4539,32 +2176,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">Luft</translation>
+        <translation>Luft</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">integriert</translation>
+        <translation>integriert</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">Gürtel</translation>
+        <translation>Gürtel</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">Fußblei</translation>
+        <translation>Fußblei</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">Backplate-Gewicht</translation>
+        <translation>Backplate-Gewicht</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">clip-on</translation>
+        <translation>clip-on</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4574,314 +2211,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Fehler beim Lesen von &apos;%s&apos;</translation>
+        <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%s&apos; lesen fehlgeschlagen. Benutze Importieren für CSV Dateien.</translation>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">keine</translation>
+        <translation>keine</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">Deko-Stopp</translation>
+        <translation>Deko-Stopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">rbt</translation>
+        <translation>rbt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">Aufstieg</translation>
+        <translation>Aufstieg</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">tiefster Deko-Stopp</translation>
+        <translation>tiefster Deko-Stopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">Arbeit</translation>
+        <translation>Arbeit</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">Sender</translation>
+        <translation>Sender</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">Verletzung</translation>
+        <translation>Verletzung</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">Markierung</translation>
+        <translation>Markierung</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">Oberfläche</translation>
+        <translation>Oberfläche</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">Sicherheitsstopp</translation>
+        <translation>Sicherheitsstopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">Gaswechsel</translation>
+        <translation>Gaswechsel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">Sicherheitsstopp (freiwillig)</translation>
+        <translation>Sicherheitsstopp (freiwillig)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">Sicherheitsstopp (verpflichtend)</translation>
+        <translation>Sicherheitsstopp (verpflichtend)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">Tiefen-Stopp</translation>
+        <translation>Tiefen-Stopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">Sicherheits-Stopp</translation>
+        <translation>Sicherheits-Stopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">Tauchgangsdauer</translation>
+        <translation>Tauchgangsdauer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">Max. Tiefe</translation>
+        <translation>Max. Tiefe</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">OLF</translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">verbleibende Atemzeit</translation>
+        <translation>verbleibende Atemzeit</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">Richtung</translation>
+        <translation>Richtung</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">Gewebewarnung</translation>
+        <translation>Gewebewarnung</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">Nullzeit</translation>
+        <translation>Nullzeit</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">ungültige Ereignisnummer</translation>
+        <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Nicht in der Lage, einen Parser für %s %s zu erstellen</translation>
+        <translation>Nicht in der Lage, einen Parser für %s %s zu erstellen</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Fehler beim Registrieren der Daten</translation>
+        <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Fehler beim Lesen des Datums</translation>
+        <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Tauchgang Nr. %d: %s %d %04d</translation>
+        <translation>Tauchgang Nr. %d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Fehler beim Lesen der Dauer</translation>
+        <translation>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Fehler beim Lesen der maximalen Tiefe</translation>
+        <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Fehler beim Lesen der Gasgemischszahl</translation>
+        <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Fehler beim Lesen des Salzgehalts</translation>
+        <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Fehler beim Lesen der Gasgemischs</translation>
+        <translation>Fehler beim Lesen der Gasgemischs</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Fehler beim Lesen der Samples</translation>
+        <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Ereignis: warte auf Benutzeraktion</translation>
+        <translation>Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
+        <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Fehler beim Registrieren der Ereignisbehandlung</translation>
+        <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Fehler bei der Registrierung der Abbruchbehandlung</translation>
+        <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Fehler beim Importieren der Tauchgangsdaten</translation>
+        <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">Fehler beim Erzeugen des libdivecomputer Contexts</translation>
+        <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Fehler beim Öffnen von %s %s (%s)</translation>
+        <translation>Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Unverständliche Prozentangabe %s
+        <translation>Unverständliche Prozentangabe %s
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Fehler beim Lesen von &apos;%s&apos;.
+        <translation>Fehler beim Lesen von &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Fehler beim Lesen von &apos;%s&apos;</translation>
+        <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished">Datenbank Anfrage &apos;get_events&apos; fehlgeschlagen.
+        <translation>Datenbank Anfrage &apos;get_events&apos; fehlgeschlagen.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished">Datenbank Verbindung fehlgeschlagen &apos;%s&apos;.
+        <translation>Datenbank Verbindung fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished">Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
+        <translation>Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">Fehler beim Öffnen des Styleshhets (%s)/%s</translation>
+        <translation>Fehler beim Öffnen des Styleshhets (%s)/%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Kann Gasgemisch %d/%d nicht finden</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Flasche für Tauchplanung</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simulierter Tauchgang</translation>
+        <translation>Kann Gasgemisch %d/%d nicht finden</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">Zu viele Gasgemische</translation>
+        <translation>Zu viele Gasgemische</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4890,7 +2519,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Subsurface Tauchplan
 basierend auf GFlow = %.0f und GFhigh = %.0f
 
@@ -4900,166 +2529,165 @@ basierend auf GFlow = %.0f und GFhigh = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Tauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s
+        <translation>Tauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s
+        <translation>Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Gaswechsel zu %s
+        <translation>Gaswechsel zu %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Gasverbrauch:
+        <translation>Gasverbrauch:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s %s
+        <translation>%.0f%s %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">T:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 D:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+V:%.2f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Berechneter tiefster Deko-Stopp %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Gewebe %.0fmin: %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Sicherheitsstopp:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+AMV:%2.1fl/min</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Sicherheitsstopp:unbk Zeit @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deko:unbk Zeit @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 In Deko</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
@@ -5068,7 +2696,7 @@ MOD:%d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 EAD:%d%s
 END:%d%s
 EADD:%d%s</translation>
@@ -5077,352 +2705,341 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Deko:%umin @ %.0f %s (berechnet)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Deko (berechnet)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Nullzeit:%umin (berechnet)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Auftauchzeit:%umin (berechnet)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation>C</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation>F</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2, %3
+%4:%5</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2 (%3 Tauchgänge)</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">ungültig</translation>
+        <translation>%1 %2 (1 Tauchgang)</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">Boot</translation>
+        <translation>Boot</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">Ufer</translation>
+        <translation>Ufer</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished">Strömung</translation>
+        <translation>Strömung</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">tief</translation>
+        <translation>tief</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">Kaverne</translation>
+        <translation>Kaverne</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">Eis</translation>
+        <translation>Eis</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">Wrack</translation>
+        <translation>Wrack</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">Höhle</translation>
+        <translation>Höhle</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">Berg</translation>
+        <translation>Berg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">Pool</translation>
+        <translation>Pool</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">See</translation>
+        <translation>See</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">Fluss</translation>
+        <translation>Fluss</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">Nacht</translation>
+        <translation>Nacht</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation>süß</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">Süsswasser</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">Übung</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">Lehr</translation>
+        <translation>Schüler</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">Foto</translation>
+        <translation>Foto</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">Video</translation>
+        <translation>Video</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausbilder</translation>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">deko</translation>
+        <translation>deko</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">mehr als %d Tage</translation>
+        <translation>mehr als %d Tage</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dt %dst %dmin</translation>
+        <translation>%dt %dst %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dst %dmin</translation>
+        <translation>%dst %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">für Tauchgänge Nr.</translation>
+        <translation>für Tauchgänge Nr.</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">für die ausgewählten Tauchgänge</translation>
+        <translation>für die ausgewählten Tauchgänge</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">für Tauchgang Nr. %d</translation>
+        <translation>für Tauchgang Nr. %d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">für den ausgewählten Tauchgang</translation>
+        <translation>für den ausgewählten Tauchgang</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">für alle Tauchgänge</translation>
+        <translation>für alle Tauchgänge</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(keine Tauchgänge)</translation>
+        <translation>(keine Tauchgänge)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">So</translation>
+        <translation>So</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">Mo</translation>
+        <translation>Mo</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">Di</translation>
+        <translation>Di</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">Mi</translation>
+        <translation>Mi</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">Do</translation>
+        <translation>Do</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">Fr</translation>
+        <translation>Fr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">Sa</translation>
+        <translation>Sa</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">Jan</translation>
+        <translation>Jan</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">Feb</translation>
+        <translation>Feb</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">Mär</translation>
+        <translation>Mär</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">Apr</translation>
+        <translation>Apr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">Mai</translation>
+        <translation>Mai</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">Jun</translation>
+        <translation>Jun</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">Jul</translation>
+        <translation>Jul</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">Aug</translation>
+        <translation>Aug</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">Sep</translation>
+        <translation>Sep</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">Okt</translation>
+        <translation>Okt</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">Nov</translation>
+        <translation>Nov</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">Dez</translation>
+        <translation>Dez</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zürich: Dateisystem beinahe voll
+        <translation>Uemis Zürich: Dateisystem beinahe voll
 Bitte den Tauchcomputer ausstecken, wieder einstecken
 und erneut versuchen</translation>
     </message>
@@ -5431,7 +3048,7 @@ und erneut versuchen</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zürich: Dateisystem voll.
+        <translation>Uemis Zürich: Dateisystem voll.
 Bitte den Tauchcomputer ausstecken, wieder einstecken
 und erneut versuchen</translation>
     </message>
@@ -5439,193 +3056,193 @@ und erneut versuchen</translation>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Unvollständiger Schreibvorgang der req.txt Datei
+        <translation>Unvollständiger Schreibvorgang der req.txt Datei
 Ist der Uemis Zürich korrekt verbunden?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">unbekannt</translation>
+        <translation>unbekannt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Lese %s %s</translation>
+        <translation>Lese %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">Daten</translation>
+        <translation>Daten</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">Logbucheintrag mit ID</translation>
+        <translation>Logbucheintrag mit ID</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">Tauchplatz Daten ID</translation>
+        <translation>Tauchplatz Daten ID</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">mehr Daten für Tauchgang ID</translation>
+        <translation>mehr Daten für Tauchgang ID</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">Nass-Tauchanzug</translation>
+        <translation>Nass-Tauchanzug</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">halbtrocken</translation>
+        <translation>halbtrocken</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">Trockentauchanzug</translation>
+        <translation>Trockentauchanzug</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">Shorty</translation>
+        <translation>Shorty</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">Weste</translation>
+        <translation>Weste</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">Latzhose</translation>
+        <translation>Latzhose</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">Jacke</translation>
+        <translation>Jacke</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">vollständiger Tauchanzug</translation>
+        <translation>vollständiger Tauchanzug</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">Zweiteiler</translation>
+        <translation>Zweiteiler</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">Membran</translation>
+        <translation>Membran</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Verbindung aufbauen</translation>
+        <translation>Verbindung aufbauen</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Uemis-Initialisierung fehlgeschlagen</translation>
+        <translation>Uemis-Initialisierung fehlgeschlagen</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Beginne zu Laden</translation>
+        <translation>Beginne zu Laden</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Verletzung des Sicherheitsstopps</translation>
+        <translation>Verletzung des Sicherheitsstopps</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Alarm: Geschwindigkeit</translation>
+        <translation>Alarm: Geschwindigkeit</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Warnung: Geschwindigkeit</translation>
+        <translation>Warnung: Geschwindigkeit</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Warnung: PO2 Grün</translation>
+        <translation>Warnung: PO2 Grün</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Warnung: Aufstieg / PO2</translation>
+        <translation>Warnung: Aufstieg / PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Alarm: Aufstieg / PO2</translation>
+        <translation>Alarm: Aufstieg / PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Info: Flaschendruck</translation>
+        <translation>Info: Flaschendruck</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Warnung: verbleibende Gas-Zeit</translation>
+        <translation>Warnung: verbleibende Gas-Zeit</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Alarm: verbleibende Gas-Zeit</translation>
+        <translation>Alarm: verbleibende Gas-Zeit</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Gaswechsel-Vorschlag</translation>
+        <translation>Gaswechsel-Vorschlag</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Tiefenbegrenzung überschritten</translation>
+        <translation>Tiefenbegrenzung überschritten</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Warnung: Maximale Deko Zeit</translation>
+        <translation>Warnung: Maximale Deko Zeit</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Info: Tauchgangsdauer</translation>
+        <translation>Info: Tauchgangsdauer</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Alarm: Tauchgangsdauer</translation>
+        <translation>Alarm: Tauchgangsdauer</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Markierung</translation>
+        <translation>Markierung</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Keine Flaschen Informationen</translation>
+        <translation>Keine Flaschen Informationen</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Warnung: Batterie schwach</translation>
+        <translation>Warnung: Batterie schwach</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Alarm: Batterie schwach</translation>
+        <translation>Alarm: Batterie schwach</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts
index b35cb38ab..b81ff0255 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -1,2394 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-No hay eventos
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete">&gt; Mes</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete">Descargar</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete">Seleccione el ordenador de buceo y el dispositivo.</translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">comienzo</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">fin</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">#</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s de %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d minutos</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dd, %dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-Techo calculado %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deco:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deco:Tiempo desconocido @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-PEA:%d%s
-PNE:%d%s
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-En deco</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL:%umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-P:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Parada de seguridad:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Parada de seguridad:tiempo desconocido @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Plan de buceo de Subsurface
-basado en GFbajo = %.0f  y  GFalto = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s event at %d:%02u</source>
-        <translation type="obsolete">Suceso: %s en %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s: Response from divelogs.de</source>
-        <translation type="obsolete">%s: Respuesta de divelogs.de</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) o (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(pulse para editar la fecha/hora)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(pulse para editar día/hora/profundidad)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(ninguna inmersión)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(nada)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 pie³/min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 pie³/min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 l/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 inmersiones por página</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">traje completo 2 piezas</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 l/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">Incrementos de 3m para el techo calculado</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 inmersiones por página</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;Add segments below.
-Each line describes part of the planned dive.
-An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. &apos;+3:30&apos;) or ends at the given time (if absolute e.g &apos;@5:00&apos;, &apos;runtime&apos;), and uses the given gas.
-An empty gas means &apos;use previous gas&apos; (or AIR if no gas was specified).
-An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.
-CC SetPoint specifies CC (rebreather) dives, leave empty for OC.&lt;/small&gt;
-</source>
-        <translation type="obsolete">&lt;small&gt;Añadir segmentos debajo.
-Cada línea describe parte de la inmersión planificada.
-Una entrada con profundidad, tiempo y gas describe un segmento que termina a la profundidad indicada, dura el tiempo señalado (si es tiempo relativo, por ejemplo &apos;+3:30&apos;) o termina en el momento marcado (si es tiempo absoluto, por ejemplo, &apos;@5:00&apos;), y consume el gas dado.
-Un gas vacío significa &apos;utilizar el gas anterior&apos; (o AIRE si no se especificó ninguno).
-Una entrada que tenga una profundidad y un gas, pero no tenga tiempo, es especial;  informa al planificador de que el gas indicado está disponible para el ascenso, una vez que se haya alcanzado la profundidad marcada.
-CC Setpoint especifica inmersiones con circuito cerrado (rebreather), dejar vacío para circuito abierto.&lt;/small&gt;
-</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">AIRE</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">Acerca de Subsurface</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Añadir</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Añadir inmersión…</translation>
-    </message>
-    <message>
-        <source>Add bookmark event here</source>
-        <translation type="obsolete">Añadir marca aquí</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Añadir inmersión</translation>
-    </message>
-    <message>
-        <source>Add gas change event here</source>
-        <translation type="obsolete">Añadir cambio de gas aquí</translation>
-    </message>
-    <message>
-        <source>Add gaschange event at %d:%02u</source>
-        <translation type="obsolete">Añadir cambio de gas en %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Añadir al viaje anterior</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Añadir punto de ruta</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Presión atmosférica</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Temperatura del aire</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Temperatura del aire en %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Preferir siempre la inmersión descargada</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">Abr</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">Ago</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Agrupar automáticamente</translation>
-    </message>
-    <message>
-        <source>Available gases</source>
-        <translation type="obsolete">Gases disponibles</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Promedio</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Promedio</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Promedio</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Promedio</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Prof. media</translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Prof. media (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">SAC medio</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Temp media</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Tiempo medio</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Cambio de emergencia a OC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">Bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Compañero</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CC SetPoint</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">No encuentro el gas %d/%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">No se puede abrir la hoja de estilos (%s)/%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Cancelado, saliendo…</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Cancelado...</translation>
-    </message>
-    <message>
-        <source>Cannot add gas change</source>
-        <translation type="obsolete">No se puede añadir cambio de gas</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">No se puede analizar la respuesta.</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Celsius</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Seleccionar archivo XML predeterminado</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Elegir archivos XML para importar en archivo de datos actual</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Cerrar</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Contraer todo</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Conectando…</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Error de conexión:</translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Crear nuevo viaje por encima</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">pie³</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Bot</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Botella</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Botella para planificar</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Botellas</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">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>
-        <source>Database connection failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Falló la conexión a la base de datos &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Falló la petición a la base de datos &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query get_events failed.
-</source>
-        <translation type="obsolete">Falló la petición get_events a la base de datos.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Fecha</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Fecha y hora</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Fecha:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">Dic</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">Archivo de datos XML predeterminado</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Borrar la información de un ordenador</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Eliminar inmersión</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Eliminar inmersiones</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Profundidad</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Se superó el límite de profundidad</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Profundidad:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Identificador de dispositivo</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Dispositivo o punto de montaje</translation>
-    </message>
-    <message>
-        <source>Display invalid dives</source>
-        <translation type="obsolete">Mostrar las inmersiones marcadas &quot;no validas&quot;</translation>
-    </message>
-    <message>
-        <source>Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</source>
-        <extracomment>++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-&lt;trailing text&gt;
-</extracomment>
-        <translation type="obsolete">Inmersión #%1$d - %2$s %3$02d/%4$02d/%5$04d a las %6$d:%7$02d %8$s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Inmersión n.º %d –</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Inmersión n.º %d: %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Nombre del ordenador de Buceo</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Información de la inmersión</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Notas de la inmersión</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Plan de inmersión – ESTO ES SOLO UNA SIMULACIÓN; NO LO USE PARA BUCEAR</translation>
-    </message>
-    <message>
-        <source>Dive Tags</source>
-        <translation type="obsolete">Etiquetas para la inmersión</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Duración de la inmersión</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Alerta de duración de inmersión</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Información sobre la ruración de lainmersión</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Fabricante del ordenador y producto</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Error al importar datos de inmersiones</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Ubicaciones de buceo</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Guía</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">¿ Cuando comienza la inmersión ?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Inmersión n.º</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Fuente de lista de inmersiones</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Divemaster</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Inmersiones</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Ubicaciones de buceo</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Descargar desde el ordenador de Buceo</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Descargar desde el ordenador de Buceo...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Descargar desde servicio web</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Descargar desde servicio web…</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Se ha completado la descarga correctamente.</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Duración</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Duración (min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">E</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editar</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Editar nombres del dispositivo</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Editar nombres de ordenador de buceo</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Editar el viaje</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Editar resumen del viaje</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Edita el nombre de un ordenador de buceo haciendo doble-clic en el campo del nombre correspondiente.</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Editar inmersión</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Editar fecha y hora de la inmersión</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Editar inmersiones</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Editar múltiples inmersiones</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Editar resumen del viaje</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Activar/desactivar eventos</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Tags</source>
-        <translation type="obsolete">Activar/desactivar etiquetas</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Fin</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Profundidad final</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Escriba un identificador de usuario y pulse «Descargar». Una vez que se complete la descarga, puede pulsar en «Aplicar» si quiere aplicar los cambios.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Equipo</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Error</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Error al obtener salinidad del agua</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Error al analizar la fecha</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Error al analizar el tiempo de buceo</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Error al analizar la mezcla de gas</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Error al analizar el conteo de mezcla de gas</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Error al analizar la máxima profundidad</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Error al analizar las muestras</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Error al registrar el manejador de cancelación</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Error al registrar los datos</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Error al registrar el manejador de eventos</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Evento: Hora de sistema=%&lt;PRId64&gt;, Hora del dispositivo=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Evento: esperando acción del usuario</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Expandir todos</translation>
-    </message>
-    <message>
-        <source>Export As UDDF File</source>
-        <translation type="obsolete">Exportar como archivo UDDF</translation>
-    </message>
-    <message>
-        <source>Export UDDF...</source>
-        <translation type="obsolete">Exportar a UDDF…</translation>
-    </message>
-    <message>
-        <source>Export dive(s) to UDDF</source>
-        <translation type="obsolete">Exportar inmersión(es) a UDDF</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">No se pudieron abrir %i archivos.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">No se pudo analizar «%s»</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">No se pudo analizar «%s».
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">No se pudo leer «%s»</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">No se pudo leer «%s».
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">Feb</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">Pies</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Archivo</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filtros</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Forzar descarga de todas las inmersiones</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Vi</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFAlto</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFalto para planificar</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFbajo</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFbajo para planificar</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS(formato WGS84 o GPS)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Gas usado</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Gas usado</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Gas usado</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Consumo de gas:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Mezcla de gas</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Ajustes generales</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Ayuda</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">parado</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Importar archivo(s)…</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Info</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Iniciar comunicación</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Introducir Plan</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Profundidad no válida – No se puede analizar «%s»</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Profundidad no válida – no se admiten valores superiores a 400m</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Gas no válido en columna %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Hora de inicio no valida</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">El identificador de usuario no es válido.</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Ene</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">Jul</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">Jun</translation>
-    </message>
-    <message>
-        <source>Last stop at 20 Feet</source>
-        <translation type="obsolete">Última parada a 20 pies</translation>
-    </message>
-    <message>
-        <source>Last stop at 6 Meters</source>
-        <translation type="obsolete">Última parada a 6 metros</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Opciones de disposición</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel y otros, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Lista</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">Litro</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Ubicación</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Registro</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Más prolongado</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Inmersión más prolongada</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Alerta de batería baja</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Aviso de batería baja</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Proveedor de mapas</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Mark invalid</source>
-        <translation type="obsolete">Marcar como no válida</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Marcar ubicación aquí</translation>
-    </message>
-    <message>
-        <source>Mark valid</source>
-        <translation type="obsolete">Marcar como válida</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Marcador</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Guía</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Advertencia de tiempo max deco</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Profundidad max</translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Prof. máxima (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Max SAC</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Temp. máx.</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Profundidad máxima: %.*f %s
-Duración :%d minutos
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Max. CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Pres. max.</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Máxima</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Máximo</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Máxima</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">Mayo</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Mezclar inmersiones</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Combinar viaje con el viaje de encima</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Combinar viaje con el viaje de abajo</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">Metro</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Profundidad mínima</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Min SAC</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Min Temp</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Mínima</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Mínimo</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Mínima</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Opciones varias</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Modelo</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lu</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Software para registro de buceo multiplataforma escrito en C</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nuevo</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Número de partida nuevo</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Siguiente DC</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Nombre</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">No se degistran datos de botella</translation>
-    </message>
-    <message>
-        <source>No cylinders listed for this dive.</source>
-        <translation type="obsolete">No se han especificado botellas para esta inmersión.</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notas</translation>
-    </message>
-    <message>
-        <source>Notes height (%d%% - %d%%)</source>
-        <translation type="obsolete">Altura de las notas (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Notas arriba</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">Nov</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">OLF</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">Oct</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Error de lectura</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">¿Está seguro de que quiere eliminar la entrada seleccionada?</translation>
-    </message>
-    <message>
-        <source>Only display dives with these tags:</source>
-        <translation type="obsolete">Mostrar solo inmersiones con estas etiquetas:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Abrir archivo</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Abrir…</translation>
-    </message>
-    <message>
-        <source>Ordering</source>
-        <translation type="obsolete">Ordenar</translation>
-    </message>
-    <message>
-        <source>Other data height (%d%% - %d%%)</source>
-        <translation type="obsolete">Altura de los otros datos (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Oxigeno</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Alarma de ascenso de PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Aviso de ascenso de PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Aviso verde de PO2</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">PSI</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Contraseña</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Elegir en el mapa</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Planificador</translation>
-    </message>
-    <message>
-        <source>Please enter your userid and password for divelogs.de. The selected dives will be added to your account</source>
-        <translation type="obsolete">Escriba su código de usuario y contraseña de divelogs.de. Las inmersiones seleccionadas se añadirán a su cuenta.</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Preferencias</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Preferencias…</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Presión</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Presión:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Anterior DC</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">Impresión en color</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Imprimir sólo inmersiones seleccionadas</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Imprimir selección</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Tipo de impresión</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Imprimir…</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Perfil</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Ajustes de perfil</translation>
-    </message>
-    <message>
-        <source>Profile height (%d%% - %d%%)</source>
-        <translation type="obsolete">Altura del perfil (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Perfil arriba</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Salir</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Alerta tiempo de gas restante</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Aviso tiempo de gas restante</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Valoración</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Leyendo %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Eliminar</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Eliminar viaje</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Eliminar inmersión del viaje</translation>
-    </message>
-    <message>
-        <source>Remove event here</source>
-        <translation type="obsolete">Eliminar evento</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Eliminar selección de inmersiones del viaje</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Renumerar</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Renumerar…</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Intentar de nuevo</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">SAC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">SAC en parada deco</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">SAC en fondo</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Violación de parada de seguridad</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sa</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Guardar como…</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">¿Guardar los cambios?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Guardar archivo como</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Guardar como</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Guardar…</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Duración del segmento</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Seleccionar eventos</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Seleccionar eventos…</translation>
-    </message>
-    <message>
-        <source>Select Tags...</source>
-        <translation type="obsolete">Seleccionar etiquetas…</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">Sep</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Escritura al archivo req.txt muy corta.
-¿Está el Uemis Zúrich correctamente conectado?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Más corta</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Inmersión más corta</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Mostrar columnas</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">Mostrar PEA, PNE, EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">Mostrar MOD</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Mostrar el techo calculado</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Mostrar en rojo el techo informado por el dc</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Mostrar en el mapa</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">Mostrar gráfico de pHe</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">Mostrar gráfico de pN%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">Mostrar gráfico de pO%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Inmersión simulada</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamaño</translation>
-    </message>
-    <message>
-        <source>Sizing heights (%% of layout)</source>
-        <translation type="obsolete">Ajuste de alturas (%% de la distribución por inmersión)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Alarma de velocidad</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Aviso de velocidad</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Inicio</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Iniciar la descarga</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Estadísticas</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Estadísticas %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Estadísticas</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Estado</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Permanecer a  %.*f %s durante %d:%02d min - runtime %d:%02u en %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Porcentaje extraño al leer %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Traje</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Interv. superf.</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Presión atmosférica (mbar)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Cambio de gas a %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Impresión de tabla</translation>
-    </message>
-    <message>
-        <source>Tags are only shown if they are identical for all edited dives</source>
-        <translation type="obsolete">Las etiquetas solo se muestran si son idénticas para todas las inmersiones editadas</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Sugerencia de cambio de botella</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Información sobre presión de botella</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Opciones técnicas</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Temp</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Temperatura</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Temperatura:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Tres</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Ju</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Hora de entrada</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Para editar la información de la inmersión
-pulse dos veces sobre ella en la lista</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Activar/desactivar ampliación</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">Demasiadas mezclas de gas</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">Demasiados puntos de ruta</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Total</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Tiempo total</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Peso total:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Cambio de cota a %.*f %s en %d:%02d min - runtime %d:%02u con %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Viaje %1$s, %2$s %3$d, %4$d (%5$d inmersión)</numerusform>
-            <numerusform>Viaje %1$s, %2$s %3$d, %4$d (%5$d inmersiones)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ma</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Tipo</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zurich: El sistema de archivos esta casi lleno 
-Desconecte / conecte el ordenador de buceo 
-e inténtelo de nuevo</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zurich: sistema de archivos está lleno
-Desconectar / conectar el ordenador de buceo
-e inténtelo de nuevo</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Fallo al intentar iniciar Uemis</translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">No es posible crear el contexto de libdivecomputer</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">No es posible crear el analizador para %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">No se pudo abrir  %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Unidades</translation>
-    </message>
-    <message>
-        <source>Upload dive(s) to divelogs.de</source>
-        <translation type="obsolete">Enviar inmersión(es) a divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de</source>
-        <translation type="obsolete">Enviar a divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de...</source>
-        <translation type="obsolete">Enviar a divelogs.de…</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Pulse con el botón derecho del ratón para marcar la ubicación con el cursor</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Identificador de usuario</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Manual de usuario</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Ver</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Visibilidad</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Volumen:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">O</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Aviso - Inmersiones extremadamente largas pueden provocar tiempos de cálculo muy largos</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Aviso - Planificar inmersiones muy profundas puede costar cantidades de tiempo excesivas</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Temp. del agua</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Servicio web</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mi</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Peso</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Sistema de lastre</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Peso:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">Archivo XML</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Año</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Estadísticas anuales</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">Ya tienes un ordenador de buceo de este modelo
-llamado %s
-Subsurface puede conservar otro nombre de este dispositivo para distinguirlo del que ya existe.  Por defecto sería el modelo y el identificador tal como se muestran abajo.Si no quieres poner nombre a este ordenador haz clic en &quot;Cancelar&quot; y Subsurface, simplemente, mostrará como nombre su modelo (lo que podría suponer que no pudieras distinguir entre los ordenadores en los diarios).</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Tiene cambios sin guardar
-¿Quiere guardar los cambios antes de cerrar el archivo de datos?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Tiene cambios sin guardar en el archivo: %s 
-¿Quiere guardar los cambios antes de cerrar el archivo de datos?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">aire</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">tiempo de aire</translation>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">altura</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">tobillo</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">ascenso</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">lastre en el arnes</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">cinturón</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">barco</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">marcador</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">cueva</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">caverna</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">techo</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">techo (parada de seguridad)</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">clip-on</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">pie³</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">datos</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">deco</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">parada deco</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">profunda</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">parada de profundidad</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">identificador de entrada del diario</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">identificador del punto de buceo</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">duración de inmersión</translation>
-    </message>
-    <message>
-        <source>drift</source>
-        <translation type="obsolete">a la deriva</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">traje seco</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">Todas las inmersiones</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">para la inmersión n.º %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">para las inmersiones n.º</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">para la inmersión seleccionada</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">para las inmersiones seleccionadas</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">agua dulce</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">ft</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">traje completo</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">cambio de mezcla</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">encabezado</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">hielo</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">integrado</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">no válida</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">el número de evento no es válido</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">chaleco</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">lago</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">lbs</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">long john</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">max ppO2</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">maxCNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">Profundidad Max</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">membrana</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">min</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">modelo=%u (0x%08x), firmware=%u (0x%08x), n.º de serie=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">más datos para el identificador de  inmersión</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">más de %d días</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">noche</translation>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">tiempo sin parada</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">ninguno</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">umbral de pHe</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">umbral de pN%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">umbral de pO%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">pascal</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">foto</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">piscina</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">rbt</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">río</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">parada de seguridad</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">parada de seguridad (obligatoria)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">parada de seguridad (voluntaria)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">semiseco</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">orilla</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">shorty</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">superficie</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">enseñanza</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">Alarma de nivel de tejidos</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">entrenamiento</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">José Ángel Tortosa Delfa
-Pablo García Castro
-Matthias Kaehlcke
-Sergio Schvezov
-Auni Somero
-Henrik Brautaset Aronsen (who doesn&apos;t speak Spanish)
-and Salvador Cuñat</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">transmisor</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">desc</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">desconocido</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">no especificado</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">chaleco</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">vídeo</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">violación</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">peso</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">traje húmedo</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">carga</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">pecio</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_ES" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Hora de entrada</translation>
+        <translation>Hora de entrada</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Profundidad</translation>
+        <translation>Profundidad</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Temp</translation>
+        <translation>Temp</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2396,57 +77,57 @@ and Salvador Cuñat</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Tipo</translation>
+        <translation>Tipo</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Tamaño</translation>
+        <translation>Tamaño</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2454,41 +135,41 @@ and Salvador Cuñat</translation>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Editar nombres de ordenador de buceo</translation>
+        <translation>Editar nombres de ordenador de buceo</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Modelo</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Modelo</translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Nombre</translation>
+        <translation>Nombre</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2496,12 +177,12 @@ and Salvador Cuñat</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2509,95 +190,87 @@ and Salvador Cuñat</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Combinar viaje con el viaje de encima</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Combinar viaje con el viaje de abajo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2605,48 +278,48 @@ and Salvador Cuñat</translation>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2654,23 +327,23 @@ and Salvador Cuñat</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2678,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">AIRE</translation>
+        <translation>AIRE</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Duración</translation>
+        <translation>Duración</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2716,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2734,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Fecha</translation>
+        <translation>Fecha</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">min</translation>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Traje</translation>
+        <translation>Traje</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Bot</translation>
+        <translation>Bot</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">maxCNS</translation>
+        <translation>maxCNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Ubicación</translation>
+        <translation>Ubicación</translation>
     </message>
 </context>
 <context>
@@ -2803,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Error</translation>
+        <translation>Error</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Intentar de nuevo</translation>
+        <translation>Intentar de nuevo</translation>
     </message>
 </context>
 <context>
@@ -2821,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Descargar desde el ordenador de Buceo</translation>
+        <translation>Descargar desde el ordenador de Buceo</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Forzar descarga de todas las inmersiones</translation>
+        <translation>Forzar descarga de todas las inmersiones</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2869,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Notas de la inmersión</translation>
+        <translation>Notas de la inmersión</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Ubicación</translation>
+        <translation>Ubicación</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Divemaster</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Compañero</translation>
+        <translation>Compañero</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Valoración</translation>
+        <translation>Valoración</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Visibilidad</translation>
+        <translation>Visibilidad</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Traje</translation>
+        <translation>Traje</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Notas</translation>
+        <translation>Notas</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Equipo</translation>
+        <translation>Equipo</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Información de la inmersión</translation>
+        <translation>Información de la inmersión</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Fecha</translation>
+        <translation>Fecha</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Duración de la inmersión</translation>
+        <translation>Duración de la inmersión</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Estadísticas</translation>
+        <translation>Estadísticas</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Profundidad</translation>
+        <translation>Profundidad</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatura</translation>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Duración</translation>
+        <translation>Duración</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Tiempo total</translation>
+        <translation>Tiempo total</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Inmersiones</translation>
+        <translation>Inmersiones</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Botellas</translation>
+        <translation>Botellas</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -3096,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">desconocido</translation>
+        <translation>desconocido</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">E</translation>
+        <translation>E</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">O</translation>
+        <translation>O</translation>
     </message>
 </context>
 <context>
@@ -3129,417 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Archivo</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Registro</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Ver</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filtros</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Ayuda</translation>
+        <translation>Filtros</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Nuevo</translation>
+        <translation>Nuevo</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Guardar como</translation>
+        <translation>Guardar como</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Cerrar</translation>
+        <translation>Cerrar</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Perfil</translation>
+        <translation>Perfil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Info</translation>
+        <translation>Info</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Preferencias</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Salir</translation>
+        <translation>Preferencias</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Editar nombres del dispositivo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Renumerar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Activar/desactivar ampliación</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Estadísticas anuales</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Anterior DC</translation>
+        <translation>Anterior DC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Siguiente DC</translation>
+        <translation>Siguiente DC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Seleccionar eventos</translation>
+        <translation>Seleccionar eventos</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Introducir Plan</translation>
+        <translation>Introducir Plan</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Acerca de Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Manual de usuario</translation>
+        <translation>Acerca de Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Abrir archivo</translation>
+        <translation>Abrir archivo</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">¿Guardar los cambios?</translation>
+        <translation>¿Guardar los cambios?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3549,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3567,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Unidades</translation>
+        <translation>Unidades</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Inmersiones</translation>
+        <translation>Inmersiones</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Profundidad</translation>
+        <translation>Profundidad</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">Metro</translation>
+        <translation>Metro</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">Pies</translation>
+        <translation>Pies</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Presión</translation>
+        <translation>Presión</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <translation>Bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">Litro</translation>
+        <translation>Litro</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">pie³</translation>
+        <translation>pie³</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatura</translation>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Celsius</translation>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Fahrenheit</translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Peso</translation>
+        <translation>Peso</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3857,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3865,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Inmersión n.º</translation>
+        <translation>Inmersión n.º</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Fecha</translation>
+        <translation>Fecha</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Profundidad</translation>
+        <translation>Profundidad</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Duración</translation>
+        <translation>Duración</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Guía</translation>
+        <translation>Guía</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Compañero</translation>
+        <translation>Compañero</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Ubicación</translation>
+        <translation>Ubicación</translation>
     </message>
 </context>
 <context>
@@ -3903,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Imprimir sólo inmersiones seleccionadas</translation>
+        <translation>Imprimir sólo inmersiones seleccionadas</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">Impresión en color</translation>
+        <translation>Impresión en color</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Tipo de impresión</translation>
+        <translation>Tipo de impresión</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 inmersiones por página</translation>
+        <translation>6 inmersiones por página</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 inmersiones por página</translation>
+        <translation>2 inmersiones por página</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Impresión de tabla</translation>
+        <translation>Impresión de tabla</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished">Ordenar</translation>
+        <translation>Ordenar</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Perfil arriba</translation>
+        <translation>Perfil arriba</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Notas arriba</translation>
+        <translation>Notas arriba</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3988,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Editar</translation>
+        <translation>Editar</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">aire</translation>
+        <translation>aire</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Cambio de emergencia a OC</translation>
+        <translation>Cambio de emergencia a OC</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">comienzo</translation>
+        <translation>comienzo</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">fin</translation>
+        <translation>fin</translation>
     </message>
 </context>
 <context>
@@ -4076,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">desconocido</translation>
+        <translation>desconocido</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Botella</translation>
+        <translation>Botella</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Mezcla de gas</translation>
+        <translation>Mezcla de gas</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished">Gas usado</translation>
+        <translation>Gas usado</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Max. CNS</translation>
+        <translation>Max. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4139,50 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">AIRE</translation>
+        <translation>AIRE</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Cerrar</translation>
+        <translation>Cerrar</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Promedio</translation>
+        <translation>Promedio</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>Mínima</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Máxima</translation>
     </message>
 </context>
 <context>
@@ -4190,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Renumerar</translation>
+        <translation>Renumerar</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Número de partida nuevo</translation>
+        <translation>Número de partida nuevo</translation>
     </message>
 </context>
 <context>
@@ -4203,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4231,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Acerca de Subsurface</translation>
+        <translation>Acerca de Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4259,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Servicio web</translation>
+        <translation>Servicio web</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Error de conexión:</translation>
+        <translation>Error de conexión:</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">El identificador de usuario no es válido.</translation>
+        <translation>El identificador de usuario no es válido.</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">No se puede analizar la respuesta.</translation>
+        <translation>No se puede analizar la respuesta.</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Se ha completado la descarga correctamente.</translation>
+        <translation>Se ha completado la descarga correctamente.</translation>
     </message>
 </context>
 <context>
@@ -4297,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>Bar</translation>
     </message>
 </context>
 <context>
@@ -4328,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -4349,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation>ID del usuario</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Contraseña</translation>
+        <translation>Contraseña</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4387,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Tipo</translation>
+        <translation>Tipo</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Peso</translation>
+        <translation>Peso</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4406,42 +2031,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4449,7 +2074,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4457,19 +2082,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4477,64 +2102,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">pascal</translation>
+        <translation>pascal</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">pie³</translation>
+        <translation>pie³</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) o (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) o (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4544,32 +2165,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">aire</translation>
+        <translation>aire</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">integrado</translation>
+        <translation>integrado</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">cinturón</translation>
+        <translation>cinturón</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">tobillo</translation>
+        <translation>tobillo</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">lastre en el arnes</translation>
+        <translation>lastre en el arnes</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">clip-on</translation>
+        <translation>clip-on</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4579,314 +2200,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">No se pudo leer «%s»</translation>
+        <translation>No se pudo leer «%s»</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">ninguno</translation>
+        <translation>ninguno</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">parada deco</translation>
+        <translation>parada deco</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">rbt</translation>
+        <translation>rbt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">ascenso</translation>
+        <translation>ascenso</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">techo</translation>
+        <translation>techo</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">carga</translation>
+        <translation>carga</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">transmisor</translation>
+        <translation>transmisor</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">violación</translation>
+        <translation>violación</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">marcador</translation>
+        <translation>marcador</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">superficie</translation>
+        <translation>superficie</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">parada de seguridad</translation>
+        <translation>parada de seguridad</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">cambio de mezcla</translation>
+        <translation>cambio de mezcla</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">parada de seguridad (voluntaria)</translation>
+        <translation>parada de seguridad (voluntaria)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">parada de seguridad (obligatoria)</translation>
+        <translation>parada de seguridad (obligatoria)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">parada de profundidad</translation>
+        <translation>parada de profundidad</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">techo (parada de seguridad)</translation>
+        <translation>techo (parada de seguridad)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">duración de inmersión</translation>
+        <translation>duración de inmersión</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">Profundidad Max</translation>
+        <translation>Profundidad Max</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">OLF</translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">tiempo de aire</translation>
+        <translation>tiempo de aire</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">encabezado</translation>
+        <translation>encabezado</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">Alarma de nivel de tejidos</translation>
+        <translation>Alarma de nivel de tejidos</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">tiempo sin parada</translation>
+        <translation>tiempo sin parada</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">el número de evento no es válido</translation>
+        <translation>el número de evento no es válido</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">No es posible crear el analizador para %s %s</translation>
+        <translation>No es posible crear el analizador para %s %s</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Error al registrar los datos</translation>
+        <translation>Error al registrar los datos</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Error al analizar la fecha</translation>
+        <translation>Error al analizar la fecha</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Inmersión n.º %d: %s %d %04d</translation>
+        <translation>Inmersión n.º %d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Error al analizar el tiempo de buceo</translation>
+        <translation>Error al analizar el tiempo de buceo</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Error al analizar la máxima profundidad</translation>
+        <translation>Error al analizar la máxima profundidad</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Error al analizar el conteo de mezcla de gas</translation>
+        <translation>Error al analizar el conteo de mezcla de gas</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Error al obtener salinidad del agua</translation>
+        <translation>Error al obtener salinidad del agua</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Error al analizar la mezcla de gas</translation>
+        <translation>Error al analizar la mezcla de gas</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Error al analizar las muestras</translation>
+        <translation>Error al analizar las muestras</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Evento: esperando acción del usuario</translation>
+        <translation>Evento: esperando acción del usuario</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">modelo=%u (0x%08x), firmware=%u (0x%08x), n.º de serie=%u (0x%08x)</translation>
+        <translation>modelo=%u (0x%08x), firmware=%u (0x%08x), n.º de serie=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Error al registrar el manejador de eventos</translation>
+        <translation>Error al registrar el manejador de eventos</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Error al registrar el manejador de cancelación</translation>
+        <translation>Error al registrar el manejador de cancelación</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Error al importar datos de inmersiones</translation>
+        <translation>Error al importar datos de inmersiones</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">No es posible crear el contexto de libdivecomputer</translation>
+        <translation>No es posible crear el contexto de libdivecomputer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">No se pudo abrir  %s %s (%s)</translation>
+        <translation>No se pudo abrir  %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Porcentaje extraño al leer %s
+        <translation>Porcentaje extraño al leer %s
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">No se pudo analizar «%s».
+        <translation>No se pudo analizar «%s».
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">No se pudo analizar «%s»</translation>
+        <translation>No se pudo analizar «%s»</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished">Falló la petición get_events a la base de datos.
+        <translation>Falló la petición get_events a la base de datos.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished">Falló la conexión a la base de datos &apos;%s&apos;.
+        <translation>Falló la conexión a la base de datos &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished">Falló la petición a la base de datos &apos;%s&apos;.
+        <translation>Falló la petición a la base de datos &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">No se puede abrir la hoja de estilos (%s)/%s</translation>
+        <translation>No se puede abrir la hoja de estilos (%s)/%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">No encuentro el gas %d/%d</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Botella para planificar</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Inmersión simulada</translation>
+        <translation>No encuentro el gas %d/%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">Demasiadas mezclas de gas</translation>
+        <translation>Demasiadas mezclas de gas</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4895,7 +2508,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Plan de buceo de Subsurface
 basado en GFbajo = %.0f  y  GFalto = %.0f
 
@@ -4905,166 +2518,162 @@ basado en GFbajo = %.0f  y  GFalto = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Cambio de cota a %.*f %s en %d:%02d min - runtime %d:%02u con %s
+        <translation>Cambio de cota a %.*f %s en %d:%02d min - runtime %d:%02u con %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Permanecer a  %.*f %s durante %d:%02d min - runtime %d:%02u en %s
+        <translation>Permanecer a  %.*f %s durante %d:%02d min - runtime %d:%02u en %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Cambio de gas a %s
+        <translation>Cambio de gas a %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Consumo de gas:
+        <translation>Consumo de gas:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s de %s
+        <translation>%.0f%s de %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 P:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Techo calculado %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Parada de seguridad:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Parada de seguridad:tiempo desconocido @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deco:Tiempo desconocido @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 En deco</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
@@ -5073,7 +2682,7 @@ MOD:%d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 PEA:%d%s
 PNE:%d%s
 EADD:%d%s</translation>
@@ -5082,352 +2691,336 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">no válida</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">barco</translation>
+        <translation>barco</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">orilla</translation>
+        <translation>orilla</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished">a la deriva</translation>
+        <translation>a la deriva</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">profunda</translation>
+        <translation>profunda</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">caverna</translation>
+        <translation>caverna</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">hielo</translation>
+        <translation>hielo</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">pecio</translation>
+        <translation>pecio</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">cueva</translation>
+        <translation>cueva</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">altura</translation>
+        <translation>altura</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">piscina</translation>
+        <translation>piscina</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">lago</translation>
+        <translation>lago</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">río</translation>
+        <translation>río</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">noche</translation>
+        <translation>noche</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">agua dulce</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">entrenamiento</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">enseñanza</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">foto</translation>
+        <translation>foto</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">vídeo</translation>
+        <translation>vídeo</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">deco</translation>
+        <translation>deco</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">más de %d días</translation>
+        <translation>más de %d días</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dd, %dh %dmin</translation>
+        <translation>%dd, %dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dh %dmin</translation>
+        <translation>%dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">para las inmersiones n.º</translation>
+        <translation>para las inmersiones n.º</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">para las inmersiones seleccionadas</translation>
+        <translation>para las inmersiones seleccionadas</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">para la inmersión n.º %d</translation>
+        <translation>para la inmersión n.º %d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">para la inmersión seleccionada</translation>
+        <translation>para la inmersión seleccionada</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">Todas las inmersiones</translation>
+        <translation>Todas las inmersiones</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(ninguna inmersión)</translation>
+        <translation>(ninguna inmersión)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">Do</translation>
+        <translation>Do</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">Lu</translation>
+        <translation>Lu</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">Ma</translation>
+        <translation>Ma</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">Mi</translation>
+        <translation>Mi</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">Ju</translation>
+        <translation>Ju</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">Vi</translation>
+        <translation>Vi</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">Sa</translation>
+        <translation>Sa</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">Ene</translation>
+        <translation>Ene</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">Feb</translation>
+        <translation>Feb</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">Mar</translation>
+        <translation>Mar</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">Abr</translation>
+        <translation>Abr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">Mayo</translation>
+        <translation>Mayo</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">Jun</translation>
+        <translation>Jun</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">Jul</translation>
+        <translation>Jul</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">Ago</translation>
+        <translation>Ago</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">Sep</translation>
+        <translation>Sep</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">Oct</translation>
+        <translation>Oct</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">Nov</translation>
+        <translation>Nov</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">Dic</translation>
+        <translation>Dic</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zurich: El sistema de archivos esta casi lleno 
+        <translation>Uemis Zurich: El sistema de archivos esta casi lleno 
 Desconecte / conecte el ordenador de buceo 
 e inténtelo de nuevo</translation>
     </message>
@@ -5436,7 +3029,7 @@ e inténtelo de nuevo</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zurich: sistema de archivos está lleno
+        <translation>Uemis Zurich: sistema de archivos está lleno
 Desconectar / conectar el ordenador de buceo
 e inténtelo de nuevo</translation>
     </message>
@@ -5444,193 +3037,193 @@ e inténtelo de nuevo</translation>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Escritura al archivo req.txt muy corta.
+        <translation>Escritura al archivo req.txt muy corta.
 ¿Está el Uemis Zúrich correctamente conectado?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">desconocido</translation>
+        <translation>desconocido</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Leyendo %s %s</translation>
+        <translation>Leyendo %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">datos</translation>
+        <translation>datos</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">identificador de entrada del diario</translation>
+        <translation>identificador de entrada del diario</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">identificador del punto de buceo</translation>
+        <translation>identificador del punto de buceo</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">más datos para el identificador de  inmersión</translation>
+        <translation>más datos para el identificador de  inmersión</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">traje húmedo</translation>
+        <translation>traje húmedo</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">semiseco</translation>
+        <translation>semiseco</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">traje seco</translation>
+        <translation>traje seco</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">shorty</translation>
+        <translation>shorty</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">chaleco</translation>
+        <translation>chaleco</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">long john</translation>
+        <translation>long john</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">chaleco</translation>
+        <translation>chaleco</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">traje completo</translation>
+        <translation>traje completo</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">traje completo 2 piezas</translation>
+        <translation>traje completo 2 piezas</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">membrana</translation>
+        <translation>membrana</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Iniciar comunicación</translation>
+        <translation>Iniciar comunicación</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Fallo al intentar iniciar Uemis</translation>
+        <translation>Fallo al intentar iniciar Uemis</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Iniciar la descarga</translation>
+        <translation>Iniciar la descarga</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Violación de parada de seguridad</translation>
+        <translation>Violación de parada de seguridad</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Alarma de velocidad</translation>
+        <translation>Alarma de velocidad</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Aviso de velocidad</translation>
+        <translation>Aviso de velocidad</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Aviso verde de PO2</translation>
+        <translation>Aviso verde de PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Aviso de ascenso de PO2</translation>
+        <translation>Aviso de ascenso de PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Alarma de ascenso de PO2</translation>
+        <translation>Alarma de ascenso de PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Información sobre presión de botella</translation>
+        <translation>Información sobre presión de botella</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Aviso tiempo de gas restante</translation>
+        <translation>Aviso tiempo de gas restante</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Alerta tiempo de gas restante</translation>
+        <translation>Alerta tiempo de gas restante</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Sugerencia de cambio de botella</translation>
+        <translation>Sugerencia de cambio de botella</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Se superó el límite de profundidad</translation>
+        <translation>Se superó el límite de profundidad</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Advertencia de tiempo max deco</translation>
+        <translation>Advertencia de tiempo max deco</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Información sobre la ruración de lainmersión</translation>
+        <translation>Información sobre la ruración de lainmersión</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Alerta de duración de inmersión</translation>
+        <translation>Alerta de duración de inmersión</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Marcador</translation>
+        <translation>Marcador</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">No se degistran datos de botella</translation>
+        <translation>No se degistran datos de botella</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Aviso de batería baja</translation>
+        <translation>Aviso de batería baja</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Alerta de batería baja</translation>
+        <translation>Alerta de batería baja</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index 36bdb3f63..a2fce9051 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -1,311 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="ee_GH">
-<context>
-    <name></name>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete">Kuu</translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">algus</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">lõpp</translation>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dt %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s⏎ Decos</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s⏎ pHe:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s⏎ pN%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s⏎ pO%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) või (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(pole sukeldumisi)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(tühi)</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 sukeldumist lehel</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 sukeldumist lehel</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">ÕHK</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Lisa Sukeldumine...</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Lisa Sukeldumine</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Keskmine</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Keskmine</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Keskmine</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Keskmine</translation>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">Bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Semu</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Ühendab...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Viga ühendamisel:</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Balloon</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Balloon planeerimiseks</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Balloonid</translation>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">TÄHELEPANU: SIIN ON KASUTUSEL BUHLMANNI ALGORITMIL PÕHINEV SUKELDUMISTE PLANEERIJA, MIS ON NULLIST IMPLEMENTEERITUD JA SEDA ON HETKEL NAPILT KATSETATUD. SOOVITAME TUNGIVALT, MITTE PLANEERIDA OMA SUKELDUMIST AINULT SIIT SAADUD ANDMETE PÕHJAL.</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Kuupäev</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Kuupäev ja aeg</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Kuupäev:</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Kustuta sukeldumine</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Sügavus</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Sügavus limiit ületatud</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Sügavus:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Seadme ID</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Dive master</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Lae kompuutrist alla</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Kestus</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Kestus (min)</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Muuda seadmete nime</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Muuda kompuutri hüüdnime</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Muuda Tripi Infot</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Muuda Tripi Kokkuvõtet</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Muuda sukeldumist</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Muuda kuupäeva/aega</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Muuda sukeldumisi</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Muuda tripi kokkuvõtet</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Lõpp</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Varustus</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">Jalg</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filter</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="et_EE" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Aeg</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Sügavus</translation>
+        <translation>Sügavus</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished"></translation>
+        <translation>Temp</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -313,57 +77,57 @@ pO%s:%.2fbar</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tüüp</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Suurus</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -371,41 +135,41 @@ pO%s:%.2fbar</source>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Muuda kompuutri hüüdnime</translation>
+        <translation>Toimeta kompuutrite hüüdnimesid</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Mudel</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished"></translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Hüüdnimi</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -413,12 +177,12 @@ pO%s:%.2fbar</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -426,87 +190,87 @@ pO%s:%.2fbar</source>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -514,48 +278,48 @@ pO%s:%.2fbar</source>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -563,23 +327,23 @@ pO%s:%.2fbar</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -587,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">ÕHK</translation>
+        <translation>ÕHK</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Kestus</translation>
+        <translation>Kestus</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -625,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -643,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished"></translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Kuupäev</translation>
+        <translation>Kuupäev</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished"></translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished"></translation>
+        <translation>jalg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished"></translation>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished"></translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished"></translation>
+        <translation>nael</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished"></translation>
+        <translation>Ülikond</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished"></translation>
+        <translation>Ball</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished"></translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished"></translation>
+        <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished"></translation>
+        <translation>maxCNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Asukoht</translation>
     </message>
 </context>
 <context>
@@ -712,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Viga</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished"></translation>
+        <translation>Korduskatse</translation>
     </message>
 </context>
 <context>
@@ -730,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Lae kompuutrist alla</translation>
+        <translation>Lae kompuutrist</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished"></translation>
+        <translation>Kõikide sukeldumiste jõuga allalaadimine</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -778,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Sukeldumise märkused</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Asukoht</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished"></translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Semu</translation>
+        <translation>Semu</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiting</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished"></translation>
+        <translation>Nähtavus</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished"></translation>
+        <translation>Ülikond</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Märkmed</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Varustus</translation>
+        <translation>Varustus</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Sukeldumise info</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Kuupäev</translation>
+        <translation>Kuupäev</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished"></translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished"></translation>
+        <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Sukeldumise aeg</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished"></translation>
+        <translation>Statistika</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Sügavus</translation>
+        <translation>Sügavus</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Temperatuur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Kestus</translation>
+        <translation>Kestus</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Koguaeg</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished"></translation>
+        <translation>Sukeldumised</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Balloonid</translation>
+        <translation>Balloonid</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -1005,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>tundmatu</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished"></translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished"></translation>
+        <translation>E</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished"></translation>
+        <translation>W</translation>
     </message>
 </context>
 <context>
@@ -1038,381 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Uus</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished"></translation>
+        <translation>Salvesta kui</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Sulge</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profiil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Info</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>Eelistused</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Muuda seadmete nime</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished"></translation>
+        <translation>Eelmine kompuuter</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished"></translation>
+        <translation>Uus kompuuter</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Vali sündmused</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished"></translation>
+        <translation>Sisesta plaan</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished"></translation>
+        <translation>Subsurface kohta</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <translation>Ava fail</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>Salvesta muudatused?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -1422,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1440,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished"></translation>
+        <translation>Ühikud</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished"></translation>
+        <translation>Sukeldumised</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Sügavus</translation>
+        <translation>Sügavus</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished"></translation>
+        <translation>Meeter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">Jalg</translation>
+        <translation>Jalg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Rõhk</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <translation>Bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished"></translation>
+        <translation>Liiter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished"></translation>
+        <translation>kuupjalg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Temperatuur</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished"></translation>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished"></translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished"></translation>
+        <translation>Raskus</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished"></translation>
+        <translation>nael</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1730,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1738,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished"></translation>
+        <translation>Sukeldumise nr</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Kuupäev</translation>
+        <translation>Kuupäev</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Sügavus</translation>
+        <translation>Sügavus</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Kestus</translation>
+        <translation>Kestus</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished"></translation>
+        <translation>Master</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Semu</translation>
+        <translation>Semu</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Asukoht</translation>
     </message>
 </context>
 <context>
@@ -1776,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation>Väljasta ainult valitud sukeldumised</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished"></translation>
+        <translation>Väljasta värvilisena</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished"></translation>
+        <translation>Väljastuse tüüp</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 sukeldumist lehel</translation>
+        <translation>6 sukeldumist lehel</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 sukeldumist lehel</translation>
+        <translation>2 sukeldumist lehel</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished"></translation>
+        <translation>Tabeli trükk</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished"></translation>
+        <translation>Tellimas</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished"></translation>
+        <translation>Profiil ülal</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished"></translation>
+        <translation>Märkmed ülal</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1861,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Toimeta</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished"></translation>
+        <translation>õhk</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished"></translation>
+        <translation>Üleminek avatud süsteemile</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">algus</translation>
+        <translation> algus</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">lõpp</translation>
+        <translation> lõpp</translation>
     </message>
 </context>
 <context>
@@ -1949,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>tundmatu</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Balloon</translation>
+        <translation>Balloon</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished"></translation>
+        <translation>Gaasisegu</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Kasutatud gaas</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished"></translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Max CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished"></translation>
+        <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2012,42 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">ÕHK</translation>
+        <translation>ÕHK</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Sulge</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Keskmine</translation>
+        <translation>Keskmine</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>Miinimum</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Maksimum</translation>
     </message>
 </context>
 <context>
@@ -2055,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation>Nummerda ümber</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished"></translation>
+        <translation>Uus algusnumber</translation>
     </message>
 </context>
 <context>
@@ -2068,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2096,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished"></translation>
+        <translation>Subsurface kohta</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2124,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished"></translation>
+        <translation>Veebiteenus</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Viga ühendamisel:</translation>
+        <translation>Viga ühendamisel:</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished"></translation>
+        <translation>Vale kasutaja ID!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished"></translation>
+        <translation>Ei suuda vastust tuvastada</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished"></translation>
+        <translation>Allalaadimine õnnestus!</translation>
     </message>
 </context>
 <context>
@@ -2162,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>Bar</translation>
     </message>
 </context>
 <context>
@@ -2193,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished"></translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -2214,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Salasõna</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2252,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tüüp</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished"></translation>
+        <translation>Raskus</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2271,42 +2031,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished"></translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -2314,7 +2074,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -2322,19 +2082,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2342,60 +2102,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished"></translation>
+        <translation>paskal</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished"></translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished"></translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished"></translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished"></translation>
+        <translation>kuupjalg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished"></translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished"></translation>
+        <translation>jalg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished"></translation>
+        <translation>nael</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished"></translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) või (%s)</translation>
+        <translation>(%s) või (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -2405,32 +2165,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished"></translation>
+        <translation>õhk</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished"></translation>
+        <translation>integreeritud</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished"></translation>
+        <translation>vöö</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished"></translation>
+        <translation>hüppeliiges</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished"></translation>
+        <translation>seljaplaadi kaal</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished"></translation>
+        <translation>külgeriputatav</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -2440,305 +2200,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%s&apos; lugemine ebaõnnestus</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished"></translation>
+        <translation>mitte ükski</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished"></translation>
+        <translation>dekopeatus</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished"></translation>
+        <translation>rbt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished"></translation>
+        <translation>tõus</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation>lagi</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished"></translation>
+        <translation>töökoormus</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished"></translation>
+        <translation>saatja</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished"></translation>
+        <translation>rikkumine</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>järjehoidja</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished"></translation>
+        <translation>pind</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished"></translation>
+        <translation>ohutuspeatus</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished"></translation>
+        <translation>gaasivahetus</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished"></translation>
+        <translation>ohutuspeatus (vabatahtlik)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished"></translation>
+        <translation>ohutuspeatus (kohustuslik)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished"></translation>
+        <translation>sügavpeatus</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished"></translation>
+        <translation>lagi (ohutuspeatus)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished"></translation>
+        <translation>sukeldumisaeg</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished"></translation>
+        <translation>max sügavus</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished"></translation>
+        <translation>Hapnikulimiidi osa (OLF)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished"></translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished"></translation>
+        <translation>aeg õhuga</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished"></translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished"></translation>
+        <translation>suund</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished"></translation>
+        <translation>koe taseme hoiatus</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished"></translation>
+        <translation>mittepeatuste aeg</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished"></translation>
+        <translation>vale sündmuse nr</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished"></translation>
+        <translation>Ei saa luua parserit %s %s jaoks</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished"></translation>
+        <translation>Viga andmete registreerimisel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished"></translation>
+        <translation>Viga kuupäeva ja aja tuvastamisel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished"></translation>
+        <translation>Sukeldumine %d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished"></translation>
+        <translation>Viga sukeldumise kestuse tuvastamisel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished"></translation>
+        <translation>Viga max sügavuse tuvastamisel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished"></translation>
+        <translation>Viga gaasisegude arvu tuvastamisel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished"></translation>
+        <translation>Viga vee soolsuse saamisel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished"></translation>
+        <translation>Viga gaasisegu tuvastamisel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished"></translation>
+        <translation>Viga proovide tuvastamisel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished"></translation>
+        <translation>Sündmus: ootan kasutaja tegevust</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished"></translation>
+        <translation>mudel=%u (0x%08x), püsivara=%u (0x%08x), seeranr=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished"></translation>
+        <translation>Viga sündmuste draiveri registreerimisel.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished"></translation>
+        <translation>Viga tühistamise draiveri registreerimisel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished"></translation>
+        <translation>Viga sukeldumise andmete impordil</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished"></translation>
+        <translation>Ei saa luua libdivecomputer konteksti</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ei saa avada %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Imelik protsendilugem %s
+</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%s&apos; tuvastamine ebaõnnestus.
+</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%s&apos; tuvastamine ebaõnnestus</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Andmebaasi päring get_events ebaõnnestus.
+</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Andmebaasi ühendus ebaõnnestus &apos;%s&apos;.
+</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Andmebaasi päring ebaõnnestus &apos;%s&apos;.
+</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished"></translation>
+        <translation>Ei suuda avada stiililehte (%s)/%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished"></translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Balloon planeerimiseks</translation>
+        <translation>Ei leia gaasi %d/%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished"></translation>
+        <translation>Liiga palju gaasisegusid</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -2747,150 +2508,170 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Subsurface poolt arvutatud sukeldumisplaan
+põhineb väärtustel GFlow = %.0f ja GFhigh = %.0f
+
+</translation>
     </message>
     <message>
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Üleminek %.*f %s %d:%02d min jooksul - käitusaeg %d:%02u on %s
+</translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Püsi %.*f %s peal %d:%02d min - jooksev aeg %d:%02u on %s
+</translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Mine %s gaasile
+</translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Gaasi tarbimine:
+</translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%.0f%s of %s
+</translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished"></translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+P:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Arvutatud lagi %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Ohutuspeatus:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Ohutuspeatus:teadmata aeg @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Deko:teadmata aeg @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s⏎ Decos</translation>
+        <translation>%s⏎ Decos</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s⏎ pO%s:%.2fbar</translation>
+        <translation>%s⏎ pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s⏎ pN%s:%.2fbar</translation>
+        <translation>%s
+pN%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s⏎ pHe:%.2fbar</translation>
+        <translation>%s⏎ pHe:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+MOD:%d%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
@@ -2898,540 +2679,547 @@ MOD:%d%s</source>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+EAD:%d%s
+END:%d%s
+EADD:%d%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished"></translation>
+        <translation>paat</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished"></translation>
+        <translation>kallas</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished"></translation>
+        <translation>triiv</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished"></translation>
+        <translation>sügav</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished"></translation>
+        <translation>õõs</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished"></translation>
+        <translation>jää</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished"></translation>
+        <translation>vrakk</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished"></translation>
+        <translation>koobas</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished"></translation>
+        <translation>kõrgus</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished"></translation>
+        <translation>bassein</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished"></translation>
+        <translation>järv</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished"></translation>
+        <translation>jõgi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished"></translation>
+        <translation>öö</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished"></translation>
+        <translation>foto</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished"></translation>
+        <translation>video</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished"></translation>
+        <translation>deko</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished"></translation>
+        <translation>enam kui %d päeva</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished"></translation>
+        <translation>%dd %dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dt %dmin</translation>
+        <translation>%dt %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished"></translation>
+        <translation>sukeldumiste nr</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation>valitud sukeldumiste</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished"></translation>
+        <translation>sukeldumise nr %d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished"></translation>
+        <translation>valitud sukeldumise</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished"></translation>
+        <translation>kõikide sukeldumiste</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(pole sukeldumisi)</translation>
+        <translation>(pole sukeldumisi)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished"></translation>
+        <translation>Päike</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished"></translation>
+        <translation>Esmasp</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished"></translation>
+        <translation>Teisip</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished"></translation>
+        <translation>Kolmap</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished"></translation>
+        <translation>Neljap</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished"></translation>
+        <translation>Reede</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished"></translation>
+        <translation>Laup</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished"></translation>
+        <translation>Jaan</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished"></translation>
+        <translation>Veebr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished"></translation>
+        <translation>Märts</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished"></translation>
+        <translation>Apr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished"></translation>
+        <translation>Mai</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished"></translation>
+        <translation>Juuni</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished"></translation>
+        <translation>Juuli</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished"></translation>
+        <translation>Aug</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished"></translation>
+        <translation>Sept</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished"></translation>
+        <translation>Okt</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished"></translation>
+        <translation>Nov</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished"></translation>
+        <translation>Dets</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Uemis Surich: failisüsteem on peaaegu täis
+Ühenda lahti/taasühenda kompuuter ja kliki &apos;Uuesti&apos;</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="25"/>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished"></translation>
+        <translation>Uemis Surich: failisüsteem on täis
+Ühenda lahti/taasühenda kompuuter
+ja proovi uuesti&apos;</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished"></translation>
+        <translation>Lühike märge req.txt faili
+Kas Uemis Zurich on ühendatud korrektselt?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>tundmatu</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished"></translation>
+        <translation>Loen %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished"></translation>
+        <translation>andmed</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished"></translation>
+        <translation>logi kirje id</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished"></translation>
+        <translation>sukeldumiskoha andmete id</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished"></translation>
+        <translation>rohkem sukeldumisandmete id</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished"></translation>
+        <translation>märgülikond</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished"></translation>
+        <translation>poolkuiv</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished"></translation>
+        <translation>kuivülikond</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished"></translation>
+        <translation>lühike ülikond</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished"></translation>
+        <translation>vest</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished"></translation>
+        <translation>pikk john</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished"></translation>
+        <translation>vest</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished"></translation>
+        <translation>täisülikond</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished"></translation>
+        <translation>2-osaline täisülikond</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished"></translation>
+        <translation>membraan</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished"></translation>
+        <translation>Algata ülekanne</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Uemis alglaadimine ebaõnnestus</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished"></translation>
+        <translation>Alusta allalaadimist</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished"></translation>
+        <translation>Ohutuspeatuse rikkumine</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>Kiiruse alarm</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Kiiruse hoiatus</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>PO2 roheline hoiatus</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>PO2 tõusu hoiatus</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>PO2 tõusu alarm</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Balloonirõhu info</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>RGT hoiatus</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished"></translation>
+        <translation>RGT häire</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished"></translation>
+        <translation>Soovitus balloonivahetuseks</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Sügavus limiit ületatud</translation>
+        <translation>Sügavuse limiit ületatud</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Max dekoaja hoiatus</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Sukeldumise aja info</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished"></translation>
+        <translation>Sukeldumise aja hoiatus</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished"></translation>
+        <translation>Tähis</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Pole Ballooni andmeid</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Patarei tühjenemise hoiatus</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished"></translation>
+        <translation>Patarei tühjenemise häire</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts
index 4fdba8729..cd9dbaa67 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -1,2389 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="fi_FI">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-Ei tapahtumia
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete"> &gt; Kuukausi</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete">Lataa</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete">Valitse sukellustietokone ja laitenimi.</translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">alku</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">loppu</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">#</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f %s (%s)
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %2$s. %4$d. %3$skuuta %5$d   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %3$d. %2$skuuta %4$d, %5$d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d. %2$skuuta %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %3$d. %2$skuuta %4$d, %5$d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%d pv %d t %d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%d t %d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-CNS: %u %%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-Laskettu katto %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deko: %u min @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deko: tuntem. aika @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-EAD: %d %s
-END: %d %s
-EADD: %d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-dekossa</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD: %d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL: %u min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-P: %d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Turvapysähdys: %u min @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Turvapysähdys: tuntemat. aika @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Subsurfacen laskema sukellussuunnitelma
-perustuu arvoihin GFlow = %.0f ja GFhigh = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T: %.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe: %.2f bar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s: %.2f bar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s: %.2f bar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s event at %d:%02u</source>
-        <translation type="obsolete">%s tapahtuma %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s: Response from divelogs.de</source>
-        <translation type="obsolete">%s: divelogs.de:n vastaus</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) tai (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(valitse muokataksesi ajankohtaa)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(valitse muokataksesi ajankohtaa tai syvyyttä)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(ei sukelluksia)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(ei mitään)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 cft³/min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 ft³/min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 l/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">Kaksi sukellusta sivulle</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">Kaksiosainen kokopuku</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 l/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">Kolmen metrin portaat laskennalliselle kattosyvyydelle</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">Kuusi sukellusta sivulle</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;Add segments below.
-Each line describes part of the planned dive.
-An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. &apos;+3:30&apos;) or ends at the given time (if absolute e.g &apos;@5:00&apos;, &apos;runtime&apos;), and uses the given gas.
-An empty gas means &apos;use previous gas&apos; (or AIR if no gas was specified).
-An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.
-CC SetPoint specifies CC (rebreather) dives, leave empty for OC.&lt;/small&gt;
-</source>
-        <translation type="obsolete">&lt;small&gt;Syötä suunnitellun sukelluksen vaiheet alla olevaan listaan.
-Kukin rivi kuvaa yhtä sukelluksen vaihetta, joka päättyy annettuun syvyyteen ja aikaan sekä käyttää annettua kaasua. Aika voidaan määritellä joko suhteellisena edellisen vaiheen päättymisestä (+3:30) tai absoluuttisena sukelluksen alusta (@3:30).
-Jos vaiheen kaasua ei ole määritelty, vaiheessa käytetään edellisen vaiheen kaasua. Suunnitelman alussa oletetaan käytettäväksi ilmaa ellei kaasua ole määritelty lainkaan.
-Voit määritellä nousua varten kaasun, joka otetaan käyttöön automaattisesti tietyssä syvyydessä. Jätä tällöin vaiheen kesto tyhjäksi ja syötä syvyys ja kaasu normaalisti.
-Saraketta CC käytetään ainoastaan suljetun kierron sukelluslaitteiden kanssa. Jos käytät avoimen kierron laitteita, jätä sarake tyhjäksi.&lt;/small&gt;
-</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">Ilma</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">Tietoja Subsurfacesta</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Lisää</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Lisää sukellus...</translation>
-    </message>
-    <message>
-        <source>Add bookmark event here</source>
-        <translation type="obsolete">Lisää kirjanmerkki</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Lisää sukellus</translation>
-    </message>
-    <message>
-        <source>Add gas change event here</source>
-        <translation type="obsolete">Lisää kaasun vaihto</translation>
-    </message>
-    <message>
-        <source>Add gaschange event at %d:%02u</source>
-        <translation type="obsolete">Lisää kaasun vaihto ajalle %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Liitä yllä olevaan retkeen</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Lisää uusi jakso</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Ilmanpaine</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Ilman lämpötila</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Ilman lämpötila (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Suosi aina ladattua sukellusta</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">huhti</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">elo</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Automaattinen ryhmittely</translation>
-    </message>
-    <message>
-        <source>Available gases</source>
-        <translation type="obsolete">Mahdolliset kaasut</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Keskim.</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Keskim.</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Keskim.</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Keskim.</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Keskisyvyys</translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Keskisyvyys (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">Pintakulutus</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Keskilämpötila</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Keskipituus</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Vaihto avoimeen ilman kiertoon</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Sukelluspari</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CCR-asetuspiste</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Seosta %d/%d ei löydy</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">Konversiotiedoston avaus epäonnistui (%s)/%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Peruutettu, poistutaan...</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Peruttu...</translation>
-    </message>
-    <message>
-        <source>Cannot add gas change</source>
-        <translation type="obsolete">Kaasun muutosta ei voida lisätä</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Vastauksen jäsentäminen ei onnistu!</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Celsius</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Valitse oletustiedosto</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Valitse tietoihin liitettävät XML-tiedostot</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Sulje</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Supista kaikki retket</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Yhdistetään...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Yhteysvirhe:</translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Liitä uuteen retkeen</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">kuutiojalka</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Säiliöt</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Säiliö</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Suunnitelman säiliö</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Säiliöt</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">S:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">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>
-        <source>Database connection failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Tietokantayhteys epäonnistui &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Tietokantakysely epäonnistui &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query get_events failed.
-</source>
-        <translation type="obsolete">Tietokantakysely &apos;get_events&apos; (nouda tapahtumat) epäonnistui.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Ajankohta</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Päivä ja aika</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Päivä:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">joulu</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">Oletustiedosto</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Poista sukellustietokoneen tiedot</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Poista sukellus</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Poista sukellukset</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Syvyys</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Syvyysraja ylitetty</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Syvyys:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Laitenimi</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Laite- tai hakemistopolku</translation>
-    </message>
-    <message>
-        <source>Display invalid dives</source>
-        <translation type="obsolete">Näytä epäkelvot sukellukset</translation>
-    </message>
-    <message>
-        <source>Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</source>
-        <extracomment>++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-&lt;trailing text&gt;
-</extracomment>
-        <translation type="obsolete">Sukellus #%1$d - %2$s %4$02d.%3$02d.%5$04d, %6$d:%7$02d %8$s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Sukellus #%d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Sukellus %1$d: %3$d. %2$skuuta %4$04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Sukellustietokoneen lempinimi</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Tiedot</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Muistiinpanot</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Sukelluksen suunnittelu - TÄMÄ ON SIMULAATIO; ÄLÄ KÄYTÄ SUKELLUKSEEN</translation>
-    </message>
-    <message>
-        <source>Dive Tags</source>
-        <translation type="obsolete">Sukellustyypit</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Sukellusaika</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Hälytys: sukellusaika</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Tiedotus: sukellusaika</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Sukellustietokoneen valmistaja ja laite</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Virhe sukellusten jäsentämisessä</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Sukelluskohde</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Sukellusvanhin</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Aloitusaika</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Sukellus</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Sukelluslistan kirjasin</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Sukellusvanhin</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Sukelluskerrat</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Sukelluskohteet</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Hae sukellustietokoneelta</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Hae sukellustietokoneelta...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Hae verkkopalvelusta</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Hae verkkopalvelusta...</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Lataus onnistui!</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Kesto</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Kesto (min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">E</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Muuta</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Muokkaa laitenimeä</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Muokkaa sukellustietokoneiden lempinimiä</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Muuta retken tietoja</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Muuta retken tietoja</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Muokkaa sukellustietokoneen lempinimeä kaksoisnäpäyttämällä muokattavaa kenttää</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Muuta sukelluksen tietoja</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Muuta sukelluksen ajankohtaa</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Muuta sukellusten tietoja</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Muuta valittujen sukellusten tietoja</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Muuta retken tietoja</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Näytä / piilota tapahtumamerkit</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Tags</source>
-        <translation type="obsolete">Näytä / piilota sukellustyypit</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Loppu</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Kohdesyvyys</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Syötä käyttäjätunnus ja paina &quot;Lataa&quot;-painiketta. Kun tiedot on ladattu, voit painaa &apos;Hyväksy&apos;, jos haluat ottaa muutokset käyttöön.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Varusteet</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Virhe</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Virhe veden suolapitoisuuden määrityksessä</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Virhe ajan jäsentämisessä</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Virhe sukelluksen keston jäsentämisessä</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Virhe kaasuseoksen jäsentämisessä</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Virhe kaasuseosten määrän jäsentämisessä</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Virhe maksimisyvyyden jäsentämisessä</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Virhe näytteiden tulkinnassa</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Virhe perumiskäsittelijän rekisteröinnissä.</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Virhe tiedon rekisteröinnissä</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Virhe tapahtumakäsittelijän rekisteröinnissä.</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Tapahtuma: systime=%&lt;PRId64&gt;, devtime=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Tapahtuma: odotetaan käyttäjän toimia</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Laajenna kaikki retket</translation>
-    </message>
-    <message>
-        <source>Export As UDDF File</source>
-        <translation type="obsolete">Vienti UDDF-tiedostoon</translation>
-    </message>
-    <message>
-        <source>Export UDDF...</source>
-        <translation type="obsolete">Vie UDDF...</translation>
-    </message>
-    <message>
-        <source>Export dive(s) to UDDF</source>
-        <translation type="obsolete">Vie sukellukset UDDF-tiedostoon</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">%i tiedoston avaaminen epäonnistui.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Tiedoston &apos;%s&apos; lukeminen epäonnistui.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Tiedoston &apos;%s&apos; lukeminen epäonnistui.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Tiedoston &apos;%s&apos; avaaminen epäonnistui</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Tiedoston &apos;%s&apos; lukeminen epäonnistui.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">helmi</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">jalka</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Tiedosto</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Suodattimet</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Lataa kaikki sukellukset</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">pe</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFhigh</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFhigh</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFlow</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFlow</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (WGS84- tai GPS-muodossa)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Kulutus</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Ilmankulutus</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Kaasu</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Kaasun kulutus:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Kaasuseos</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Yleisasetukset</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Ohje</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">Toimeton</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Liitä tiedostot...</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Tiedot</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Muodosta yhteys</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Suunnittele</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Virheellinen syvyys - seuraavan syötteen tulkinta epäonnistui: %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Virheellinen syvyys - yli neljänsadan metrin syvyisiä sukelluksia ei tueta</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Virheellinen kaasu rivillä %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Virhellinen aloitusaika</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Tuntematon käyttäjä!</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">tammi</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">heinä</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">kesä</translation>
-    </message>
-    <message>
-        <source>Last stop at 20 Feet</source>
-        <translation type="obsolete">Viimeinen pysähdys 20 jalassa</translation>
-    </message>
-    <message>
-        <source>Last stop at 6 Meters</source>
-        <translation type="obsolete">Viimeinen pysähdys kuudessa metrissä</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Sommittelun asetukset</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel et al., 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Sukelluslista</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">litra</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Kohde</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Loki</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Pisin</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Pisin sukellus</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Hälytys: heikko paristo</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Varoitus: heikko paristo</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Karttapohja</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">maalis</translation>
-    </message>
-    <message>
-        <source>Mark invalid</source>
-        <translation type="obsolete">Merkitse epäkelvoksi</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Valitse sijainti</translation>
-    </message>
-    <message>
-        <source>Mark valid</source>
-        <translation type="obsolete">Merkitse kelpaavaksi</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">merkki</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Sukellusvanhin</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Varoitus: etappipysähdysaika</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Suurin syvyys</translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Suurin syvyys (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Suurin pintakulutus</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Ylin lämpötila</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Suurin syvyys: %.*f %s
-Kesto: %d min
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Max. CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Nimellispaine</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Suurin</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Suurin</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Korkein</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">touko</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Yhdistä sukellukset</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Liitä retki yllä olevaan retkeen</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Liitä retki alla olevaan retkeen</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">metri</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Pienin syvyys</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Pienin pintakulutus</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Alin lämpötila</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Pienin</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Pienin</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Alin</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Sekalaiset asetukset</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Malli</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">ma</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Usean laitealustan sukelluspäiväkirjaohjelma C-kielellä</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Uusi</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Uusi aloitusnumero</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Seuraava tietokone</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Lempinimi</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Ei tietoja säiliöistä</translation>
-    </message>
-    <message>
-        <source>No cylinders listed for this dive.</source>
-        <translation type="obsolete">Sukellukselle ei ole määritetty säiliötä</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Muistiinpanot</translation>
-    </message>
-    <message>
-        <source>Notes height (%d%% - %d%%)</source>
-        <translation type="obsolete">Muistiinpanojen korkeus (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Muistiinpanot yllä</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">marras</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">Happikertymä</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">Happikertymä</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">loka</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Outo pthread-virheen paluukoodi</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Poistetaanko valittu merkintä?</translation>
-    </message>
-    <message>
-        <source>Only display dives with these tags:</source>
-        <translation type="obsolete">Näytä vain valituntyyppiset sukellukset:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Avaa tiedosto</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Avaa...</translation>
-    </message>
-    <message>
-        <source>Ordering</source>
-        <translation type="obsolete">Järjestys</translation>
-    </message>
-    <message>
-        <source>Other data height (%d%% - %d%%)</source>
-        <translation type="obsolete">Muiden tietojen korkeus (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Happi</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Hälytys: hapen osapaine</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Varoitus: hapen osapaine</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Varoitus: hapen osapaine (green)</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Salasana</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Valitse kartalta</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Suunnittelu</translation>
-    </message>
-    <message>
-        <source>Please enter your userid and password for divelogs.de. The selected dives will be added to your account</source>
-        <translation type="obsolete">Syötä käyttäjätunnus ja salasana divelogs.de -sivustolle. Valitut sukellukset lisätään tunnuksellesi</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Asetukset</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Asetukset...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Paine</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Paine:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Edellinen tietokone</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">Väritulostus</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Tulosta valitut sukellukset</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Tulosteen valinta</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Tulosteen tyyppi</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Tulosta...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Profiilikuvaaja</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Profiiliasetukset</translation>
-    </message>
-    <message>
-        <source>Profile height (%d%% - %d%%)</source>
-        <translation type="obsolete">Profiilin korkeus (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Profiili yllä</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Lopeta</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Hälytys: kaasumäärä</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Varoitus: kaasumäärä</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Yleisarvio</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Luetaan sukellusta %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Poista</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Poista retki</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Erota sukellus pois retkestä</translation>
-    </message>
-    <message>
-        <source>Remove event here</source>
-        <translation type="obsolete">Lisää tapahtuma tähän</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Erota valitut sukellukset pois retkestä</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Uudellennumeroi</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Uudellennumeroi...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Yritä uudestaan</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">Pintakulutus</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">Pintakulutus deko-pysähdyksessä</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">Pintakulutus sukelluksen aikana</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Turvapysähdyksen laiminlyönti</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">la</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Tallenna nimellä...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Tallenna muutokset?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Tallenna nimellä</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Tallenna nimellä...</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Tallenna...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Aika</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Valitse tapahtumat</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Valitse tapahtumat...</translation>
-    </message>
-    <message>
-        <source>Select Tags...</source>
-        <translation type="obsolete">Valitse sukellustyypit...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">syys</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Tiedoston req.txt kirjoittaminen epäonnistui.
-Onko Uemis Zurich kytketty oikein?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Lyhin</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Lyhin sukellus</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Näytä sarakkeet</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">Näytä EAD, END sekä EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">Näytä MOD</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Näytä laskettu kattosyvyys</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Näytä sukellustietokoneen raportoima kattosyvyys punaisella</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Näytä kartalla</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">Näytä pHe-kuvaaja</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">Näytä pN%s-kuvaaja</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">Näytä pO%s-kuvaaja</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simuloitu sukellus</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tilavuus</translation>
-    </message>
-    <message>
-        <source>Sizing heights (%% of layout)</source>
-        <translation type="obsolete">Korkeuksien määritys(%% pohjasta)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Hälytys: nousunopeus</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Varoitus: nousunopeus</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Alku</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Aloita lataus</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Tilastot</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Tilastot %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Tilastot</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Tila</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Pysy %.*f %s:n syvyydessä %d:%02d min - aika %d:%02u kaasulla %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Outo prosenttiosuus: %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Puku</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">su</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Pinta-aika</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Ilmanpaine pinnalla (mbar)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Vaihda kaasu seuraavaan: %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Taulukkotuloste</translation>
-    </message>
-    <message>
-        <source>Tags are only shown if they are identical for all edited dives</source>
-        <translation type="obsolete">Sukellustyypit näytetään vain jos ne ovat identtiset kaikissa muokattavissa sukelluksissa</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Säiliönvaihtoehdotus</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Tiedotus: säiliöpaine</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Tekniikka-asetukset</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Lämpötila</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Lämpötila</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Lämpötila:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Kaikki</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">to</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Kello</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Avaa sukellustietojen muokkausikkuna
-kaksoisnäpäyttämällä sukellusta listalla</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Venytä sukellusprofiilikuvaajaa</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">Liian monta kaasuseosta</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">Liikaa välietappeja</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Yhteensä</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Kokonaisaika</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Kokonaismassa:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Siirtymä %.*f %s:n syvyyteen ajassa %d:%02d - aika %d:%02u kaasulla %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Retki %1$s, %3$d. %2$skuuta %4$04d (%5$d sukellus)</numerusform>
-            <numerusform>Retki %1$s, %3$d. %2$skuuta %4$04d (%5$d sukellusta)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">ti</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Tyyppi</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zurich: tiedostojärjestelmä on lähes täynnä.
-Liitä sukellustietokone uudestaan
-ja yritä uudestaan.</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zurich: Tiedostojärjestelmä on täynnä.
-Liitä sukellustietokone uudestaan
-ja yritä uudestaan.</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Uemiksen lukeminen epäonnistui</translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">libdivecomputer-kontekstin luominen epäonnistui</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Jäsentäjän luominen %s %s epäonnistui</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Avaaminen epäonnistui: %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Yksiköt</translation>
-    </message>
-    <message>
-        <source>Upload dive(s) to divelogs.de</source>
-        <translation type="obsolete">Lähetä sukellukset divelogs.de -sivustolle</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de</source>
-        <translation type="obsolete">Lähetä divelogs.de -sivustolle</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de...</source>
-        <translation type="obsolete">Lähetä divelogs.de -sivustolle...</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Näpäytä oikealla painikkeella merkitäksesi kursorin osoittaman sukelluskohteen</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Käyttäjätunniste</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Käyttöohje</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Näytä</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Näkyvyys</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Tilavuus:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">W</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Varoitus - hyvin pitkien sukellusten suunnitelman laskeminen voi kestää kohtuuttoman kauan</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Varoitus: hyvin syvien sukellusten suunnittelu voi kestää kohtuuttoman kauan</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Veden lämpötila</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Verkkopalvelu</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">ke</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Painot</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Painot</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Massa:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">XML-tiedosto</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Vuosi</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Vuositilastot</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">Sinulla on jo tämän mallinen sukellustietokone
-nimellä %s
-Voit halutessasi antaa laitteelle lempinimen. Lempinimen antaminen helpottaa sukellustietokoneen sekä sen lokien tunnistamisessa. Oletuksena laitteen nimenä käytetään sen mallia ja tunnistetta.
-Jos et halua antaa laitteelle lempinimeä, paina &quot;Peru&quot;-painiketta.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Sinulla on tallentamattomia muutoksia.
-Haluatko tallentaa muutokset ennen tietojen sulkemista?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Tiedosto %s on muuttunut.
-Haluatko tallentaa muutokset ennen tietojen sulkemista?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">ilma</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">Ilma-aika</translation>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">korkeus</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">nilkkapaino</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">nousu</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">selkäpaino</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">vyöpaino</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">vene</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">kirjanmerkki</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">luola</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">luola (cavern)</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">katto</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">katto (turvapysähdys)</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">clip-on</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">ft³</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">tieto</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">deko</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">deko-pysähdys</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">syvä</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">syväpysähdys</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">id: sukelluslokimerkintä</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">id: lisää sijaintitietoa</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">sukellusaika</translation>
-    </message>
-    <message>
-        <source>drift</source>
-        <translation type="obsolete">virta</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">kuivapuku</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">kaikille sukelluksille</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">Sukellus #%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">sukellukselle numero </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">valittu sukellus</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">valitut sukellukset</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">makea vesi</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">ft</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">kokopuku</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">Kaasun vaihto</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">suunta</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">jää</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">integroitu</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">epäkelpo</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">tuntematon tapahtumanumero</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">takki</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">järvi</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">pauna</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">haalari</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">max ppO2</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">maxCNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">Suurin syvyys</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">laminaatti</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">min</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">id: lisää sukellusdataa</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">yli %d päivää</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">yö</translation>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">keskeytyksetön aika</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">ei mitään</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">pHe-kynnys</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">pN%s-kynnys</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">pO%s-kynnys</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">Pa</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">valokuva</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">uima-allas</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">pohja-aika</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">joki</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">turvapysähdys</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">turvapysähdys (pakollinen)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">turvapysähdys (vapaaehtoinen)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">puolikuiva</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">ranta</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">lyhyt</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">pinta</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">opetus</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">kudoskertymän varoitus</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">harjoittelu</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">Tommi Saviranta
-Miika Turkia</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">lähetin</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">tuntematon</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">tuntematon</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">määrittelemätön</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">liivi</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">video</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">rike</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">Massa</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">märkäpuku</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">työmäärä</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">hylky</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi_FI" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Kello</translation>
+        <translation>Kello</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Syvyys</translation>
+        <translation>Syvyys</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Lämpötila</translation>
+        <translation>Lämpötila</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2391,57 +77,57 @@ Miika Turkia</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Tyyppi</translation>
+        <translation>Tyyppi</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Tilavuus</translation>
+        <translation>Tilavuus</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Alkupaine</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Loppupaine</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation>O2%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation>HE</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2449,41 +135,42 @@ Miika Turkia</translation>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Muokkaa sukellustietokoneiden lempinimiä</translation>
+        <translation>Muokkaa sukellustietokoneiden lempinimiä</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation>Poistetaanko valittu sukellustietokone?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation>Oletko varma, että haluat
+poistaa valitun sukellustietokoneen?</translation>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Malli</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Malli</translation>
+        <source>Device ID</source>
+        <translation>Laite ID</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Lempinimi</translation>
+        <translation>Lempinimi</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2491,12 +178,12 @@ Miika Turkia</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation>l/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation>jalkaa/min</translation>
     </message>
 </context>
 <context>
@@ -2504,95 +191,87 @@ Miika Turkia</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Liitä retki yllä olevaan retkeen</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Liitä retki alla olevaan retkeen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation>yhdistä valitut sukellukset</translation>
     </message>
 </context>
 <context>
@@ -2600,48 +279,48 @@ Miika Turkia</translation>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation>Viimeinen pysähdys kuudessa metrissä</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Alkuaika</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2649,23 +328,24 @@ Miika Turkia</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation>10m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation>30 jalkaa</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tämä toimenpide hävittää yhden tai useamman pysähdyksistäsi,
+poista ensin pysähdykset.</translation>
     </message>
 </context>
 <context>
@@ -2673,37 +353,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">Ilma</translation>
+        <translation>Ilma</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Lopullinen syvyys</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Kesto</translation>
+        <translation>Kesto</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation>Käytetty kaasuseos</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation>Hylätäänkö suunnitelma?</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation>Olet hylkäämässä suunnitelmasi.</translation>
     </message>
 </context>
 <context>
@@ -2711,17 +391,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2729,67 +409,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Ajankohta</translation>
+        <translation>Ajankohta</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">min</translation>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">pauna</translation>
+        <translation>pauna</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Puku</translation>
+        <translation>Puku</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Säiliöt</translation>
+        <translation>Säiliöt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">Pintakulutus</translation>
+        <translation>Pintakulutus</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">Happikertymä</translation>
+        <translation>Happikertymä</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">maxCNS</translation>
+        <translation>maxCNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Kohde</translation>
+        <translation>Kohde</translation>
     </message>
 </context>
 <context>
@@ -2798,17 +478,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Virhe</translation>
+        <translation>Virhe</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Yritä uudestaan</translation>
+        <translation>Yritä uudestaan</translation>
     </message>
 </context>
 <context>
@@ -2816,47 +496,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Hae sukellustietokoneelta</translation>
+        <translation>Hae sukellustietokoneelta</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation>Valmistaja</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Sukellustietokone</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation>Laite- tai hakemistopolku</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Lataa kaikki sukellukset</translation>
+        <translation>Lataa kaikki sukellukset</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2864,225 +544,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Muistiinpanot</translation>
+        <translation>Muistiinpanot</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Kohde</translation>
+        <translation>Kohde</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Sukellusvanhin</translation>
+        <translation>Sukellusvanhin</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Sukelluspari</translation>
+        <translation>Sukelluspari</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Yleisarvio</translation>
+        <translation>Yleisarvio</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Näkyvyys</translation>
+        <translation>Näkyvyys</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Puku</translation>
+        <translation>Puku</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Muistiinpanot</translation>
+        <translation>Muistiinpanot</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Varusteet</translation>
+        <translation>Varusteet</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Tiedot</translation>
+        <translation>Tiedot</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Ajankohta</translation>
+        <translation>Ajankohta</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">Pintakulutus</translation>
+        <translation>Pintakulutus</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">Happikertymä</translation>
+        <translation>Happikertymä</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Sukellusaika</translation>
+        <translation>Sukellusaika</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Tilastot</translation>
+        <translation>Tilastot</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Syvyys</translation>
+        <translation>Syvyys</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Lämpötila</translation>
+        <translation>Lämpötila</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Kesto</translation>
+        <translation>Kesto</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Kokonaisaika</translation>
+        <translation>Kokonaisaika</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Sukelluskerrat</translation>
+        <translation>Sukelluskerrat</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Säiliöt</translation>
+        <translation>Säiliöt</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -3091,32 +771,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">tuntematon</translation>
+        <translation>tuntematon</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">E</translation>
+        <translation>E</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">W</translation>
+        <translation>W</translation>
     </message>
 </context>
 <context>
@@ -3124,417 +804,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Tiedosto</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Loki</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Näytä</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Suodattimet</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Ohje</translation>
+        <translation>Suodattimet</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Uusi</translation>
+        <translation>Uusi</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Tallenna nimellä...</translation>
+        <translation>Tallenna nimellä...</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Sulje</translation>
+        <translation>Sulje</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Profiilikuvaaja</translation>
+        <translation>Profiilikuvaaja</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Tiedot</translation>
+        <translation>Tiedot</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Asetukset</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Lopeta</translation>
+        <translation>Asetukset</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Muokkaa laitenimeä</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Uudellennumeroi</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Venytä sukellusprofiilikuvaajaa</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Vuositilastot</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Edellinen tietokone</translation>
+        <translation>Edellinen tietokone</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Seuraava tietokone</translation>
+        <translation>Seuraava tietokone</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Valitse tapahtumat</translation>
+        <translation>Valitse tapahtumat</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Suunnittele</translation>
+        <translation>Suunnittele</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Tietoja Subsurfacesta</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Käyttöohje</translation>
+        <translation>Tietoja Subsurfacesta</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Avaa tiedosto</translation>
+        <translation>Avaa tiedosto</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Tallenna muutokset?</translation>
+        <translation>Tallenna muutokset?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3544,17 +1184,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3562,289 +1202,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Yksiköt</translation>
+        <translation>Yksiköt</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Sukelluskerrat</translation>
+        <translation>Sukelluskerrat</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Syvyys</translation>
+        <translation>Syvyys</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">metri</translation>
+        <translation>metri</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">jalka</translation>
+        <translation>jalka</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Paine</translation>
+        <translation>Paine</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">litra</translation>
+        <translation>litra</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">kuutiojalka</translation>
+        <translation>kuutiojalka</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Lämpötila</translation>
+        <translation>Lämpötila</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Celsius</translation>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Fahrenheit</translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Painot</translation>
+        <translation>Painot</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">pauna</translation>
+        <translation>pauna</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3852,7 +1492,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3860,37 +1500,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Sukellus</translation>
+        <translation>Sukellus</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Ajankohta</translation>
+        <translation>Ajankohta</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Syvyys</translation>
+        <translation>Syvyys</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Kesto</translation>
+        <translation>Kesto</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Sukellusvanhin</translation>
+        <translation>Sukellusvanhin</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Sukelluspari</translation>
+        <translation>Sukelluspari</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Kohde</translation>
+        <translation>Kohde</translation>
     </message>
 </context>
 <context>
@@ -3898,84 +1538,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Tulosta valitut sukellukset</translation>
+        <translation>Tulosta valitut sukellukset</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">Väritulostus</translation>
+        <translation>Väritulostus</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Tulosteen tyyppi</translation>
+        <translation>Tulosteen tyyppi</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">Kuusi sukellusta sivulle</translation>
+        <translation>Kuusi sukellusta sivulle</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">Kaksi sukellusta sivulle</translation>
+        <translation>Kaksi sukellusta sivulle</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Taulukkotuloste</translation>
+        <translation>Taulukkotuloste</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished">Järjestys</translation>
+        <translation>Järjestys</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Profiili yllä</translation>
+        <translation>Profiili yllä</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Muistiinpanot yllä</translation>
+        <translation>Muistiinpanot yllä</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3983,87 +1623,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Muuta</translation>
+        <translation>Muuta</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">ilma</translation>
+        <translation>ilma</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Vaihto avoimeen ilman kiertoon</translation>
+        <translation>Vaihto avoimeen ilman kiertoon</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">alku</translation>
+        <translation>alku</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">loppu</translation>
+        <translation>loppu</translation>
     </message>
 </context>
 <context>
@@ -4071,62 +1711,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">tuntematon</translation>
+        <translation>tuntematon</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Säiliö</translation>
+        <translation>Säiliö</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Kaasuseos</translation>
+        <translation>Kaasuseos</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Kaasu</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">Pintakulutus</translation>
+        <translation>Pintakulutus</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Max. CNS</translation>
+        <translation>Max. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">Happikertymä</translation>
+        <translation>Happikertymä</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4134,50 +1774,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">Ilma</translation>
+        <translation>Ilma</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Sulje</translation>
+        <translation>Sulje</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Keskim.</translation>
+        <translation>Keskim.</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>Alin</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Korkein</translation>
     </message>
 </context>
 <context>
@@ -4185,12 +1817,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Uudellennumeroi</translation>
+        <translation>Uudellennumeroi</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Uusi aloitusnumero</translation>
+        <translation>Uusi aloitusnumero</translation>
     </message>
 </context>
 <context>
@@ -4198,27 +1830,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4226,27 +1858,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Tietoja Subsurfacesta</translation>
+        <translation>Tietoja Subsurfacesta</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4254,37 +1886,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Verkkopalvelu</translation>
+        <translation>Verkkopalvelu</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Yhteysvirhe:</translation>
+        <translation>Yhteysvirhe:</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Tuntematon käyttäjä!</translation>
+        <translation>Tuntematon käyttäjä!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Vastauksen jäsentäminen ei onnistu!</translation>
+        <translation>Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Lataus onnistui!</translation>
+        <translation>Lataus onnistui!</translation>
     </message>
 </context>
 <context>
@@ -4292,30 +1924,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
@@ -4323,20 +1955,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -4344,37 +1976,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Salasana</translation>
+        <translation>Salasana</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4382,17 +2014,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Tyyppi</translation>
+        <translation>Tyyppi</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Painot</translation>
+        <translation>Painot</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4401,42 +2033,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4444,7 +2076,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4452,19 +2084,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4472,64 +2104,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">Pa</translation>
+        <translation>Pa</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">ft³</translation>
+        <translation>ft³</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">pauna</translation>
+        <translation>pauna</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) tai (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s %3$d. %2$skuuta %4$d %5$2d:%6$02d</translation>
+        <translation>(%s) tai (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4539,32 +2167,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">ilma</translation>
+        <translation>ilma</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">integroitu</translation>
+        <translation>integroitu</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">vyöpaino</translation>
+        <translation>vyöpaino</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">nilkkapaino</translation>
+        <translation>nilkkapaino</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">selkäpaino</translation>
+        <translation>selkäpaino</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">clip-on</translation>
+        <translation>clip-on</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4574,314 +2202,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Tiedoston &apos;%s&apos; avaaminen epäonnistui</translation>
+        <translation>Tiedoston &apos;%s&apos; avaaminen epäonnistui</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">ei mitään</translation>
+        <translation>ei mitään</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">deko-pysähdys</translation>
+        <translation>deko-pysähdys</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">pohja-aika</translation>
+        <translation>pohja-aika</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">nousu</translation>
+        <translation>nousu</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">katto</translation>
+        <translation>katto</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">työmäärä</translation>
+        <translation>työmäärä</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">lähetin</translation>
+        <translation>lähetin</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">rike</translation>
+        <translation>rike</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">kirjanmerkki</translation>
+        <translation>kirjanmerkki</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">pinta</translation>
+        <translation>pinta</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">turvapysähdys</translation>
+        <translation>turvapysähdys</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">Kaasun vaihto</translation>
+        <translation>Kaasun vaihto</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">turvapysähdys (vapaaehtoinen)</translation>
+        <translation>turvapysähdys (vapaaehtoinen)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">turvapysähdys (pakollinen)</translation>
+        <translation>turvapysähdys (pakollinen)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">syväpysähdys</translation>
+        <translation>syväpysähdys</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">katto (turvapysähdys)</translation>
+        <translation>katto (turvapysähdys)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">sukellusaika</translation>
+        <translation>sukellusaika</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">Suurin syvyys</translation>
+        <translation>Suurin syvyys</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">Happikertymä</translation>
+        <translation>Happikertymä</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">Ilma-aika</translation>
+        <translation>Ilma-aika</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">suunta</translation>
+        <translation>suunta</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">kudoskertymän varoitus</translation>
+        <translation>kudoskertymän varoitus</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">keskeytyksetön aika</translation>
+        <translation>keskeytyksetön aika</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">tuntematon tapahtumanumero</translation>
+        <translation>tuntematon tapahtumanumero</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Jäsentäjän luominen %s %s epäonnistui</translation>
+        <translation>Jäsentäjän luominen %s %s epäonnistui</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Virhe tiedon rekisteröinnissä</translation>
+        <translation>Virhe tiedon rekisteröinnissä</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Virhe ajan jäsentämisessä</translation>
+        <translation>Virhe ajan jäsentämisessä</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Sukellus %1$d: %3$d. %2$skuuta %4$04d</translation>
+        <translation>Sukellus %1$d: %3$d. %2$skuuta %4$04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Virhe sukelluksen keston jäsentämisessä</translation>
+        <translation>Virhe sukelluksen keston jäsentämisessä</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Virhe maksimisyvyyden jäsentämisessä</translation>
+        <translation>Virhe maksimisyvyyden jäsentämisessä</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Virhe kaasuseosten määrän jäsentämisessä</translation>
+        <translation>Virhe kaasuseosten määrän jäsentämisessä</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Virhe veden suolapitoisuuden määrityksessä</translation>
+        <translation>Virhe veden suolapitoisuuden määrityksessä</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Virhe kaasuseoksen jäsentämisessä</translation>
+        <translation>Virhe kaasuseoksen jäsentämisessä</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Virhe näytteiden tulkinnassa</translation>
+        <translation>Virhe näytteiden tulkinnassa</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Tapahtuma: odotetaan käyttäjän toimia</translation>
+        <translation>Tapahtuma: odotetaan käyttäjän toimia</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)</translation>
+        <translation>malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Virhe tapahtumakäsittelijän rekisteröinnissä.</translation>
+        <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Virhe perumiskäsittelijän rekisteröinnissä.</translation>
+        <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Virhe sukellusten jäsentämisessä</translation>
+        <translation>Virhe sukellusten jäsentämisessä</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">libdivecomputer-kontekstin luominen epäonnistui</translation>
+        <translation>libdivecomputer-kontekstin luominen epäonnistui</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Avaaminen epäonnistui: %s %s (%s)</translation>
+        <translation>Avaaminen epäonnistui: %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Outo prosenttiosuus: %s
+        <translation>Outo prosenttiosuus: %s
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Tiedoston &apos;%s&apos; lukeminen epäonnistui.
+        <translation>Tiedoston &apos;%s&apos; lukeminen epäonnistui.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Tiedoston &apos;%s&apos; lukeminen epäonnistui.</translation>
+        <translation>Tiedoston &apos;%s&apos; lukeminen epäonnistui.</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished">Tietokantakysely &apos;get_events&apos; (nouda tapahtumat) epäonnistui.
+        <translation>Tietokantakysely &apos;get_events&apos; (nouda tapahtumat) epäonnistui.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished">Tietokantayhteys epäonnistui &apos;%s&apos;.
+        <translation>Tietokantayhteys epäonnistui &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished">Tietokantakysely epäonnistui &apos;%s&apos;.
+        <translation>Tietokantakysely epäonnistui &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">Konversiotiedoston avaus epäonnistui (%s)/%s</translation>
+        <translation>Konversiotiedoston avaus epäonnistui (%s)/%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Seosta %d/%d ei löydy</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Suunnitelman säiliö</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simuloitu sukellus</translation>
+        <translation>Seosta %d/%d ei löydy</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">Liian monta kaasuseosta</translation>
+        <translation>Liian monta kaasuseosta</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4890,7 +2510,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Subsurfacen laskema sukellussuunnitelma
 perustuu arvoihin GFlow = %.0f ja GFhigh = %.0f
 
@@ -4900,166 +2520,162 @@ perustuu arvoihin GFlow = %.0f ja GFhigh = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Siirtymä %.*f %s:n syvyyteen ajassa %d:%02d - aika %d:%02u kaasulla %s
+        <translation>Siirtymä %.*f %s:n syvyyteen ajassa %d:%02d - aika %d:%02u kaasulla %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Pysy %.*f %s:n syvyydessä %d:%02d min - aika %d:%02u kaasulla %s
+        <translation>Pysy %.*f %s:n syvyydessä %d:%02d min - aika %d:%02u kaasulla %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Vaihda kaasu seuraavaan: %s
+        <translation>Vaihda kaasu seuraavaan: %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Kaasun kulutus:
+        <translation>Kaasun kulutus:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f %s (%s)
+        <translation>%.0f %s (%s)
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">S:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 P: %d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T: %.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Laskettu katto %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Turvapysähdys: %u min @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Turvapysähdys: tuntemat. aika @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deko: %u min @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deko: tuntem. aika @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 dekossa</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL: %u min</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 CNS: %u %%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s: %.2f bar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s: %.2f bar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe: %.2f bar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD: %d %s</translation>
     </message>
     <message>
@@ -5068,7 +2684,7 @@ MOD: %d %s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 EAD: %d %s
 END: %d %s
 EADD: %d %s</translation>
@@ -5077,352 +2693,336 @@ EADD: %d %s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">epäkelpo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">vene</translation>
+        <translation>vene</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">ranta</translation>
+        <translation>ranta</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished">virta</translation>
+        <translation>virta</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">syvä</translation>
+        <translation>syvä</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">luola (cavern)</translation>
+        <translation>luola (cavern)</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">jää</translation>
+        <translation>jää</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">hylky</translation>
+        <translation>hylky</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">luola</translation>
+        <translation>luola</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">korkeus</translation>
+        <translation>korkeus</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">uima-allas</translation>
+        <translation>uima-allas</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">järvi</translation>
+        <translation>järvi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">joki</translation>
+        <translation>joki</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">yö</translation>
+        <translation>yö</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">makea vesi</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">harjoittelu</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">opetus</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">valokuva</translation>
+        <translation>valokuva</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">video</translation>
+        <translation>video</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">deko</translation>
+        <translation>deko</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">yli %d päivää</translation>
+        <translation>yli %d päivää</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%d pv %d t %d min</translation>
+        <translation>%d pv %d t %d min</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%d t %d min</translation>
+        <translation>%d t %d min</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">sukellukselle numero </translation>
+        <translation>sukellukselle numero </translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">valitut sukellukset</translation>
+        <translation>valitut sukellukset</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">Sukellus #%d</translation>
+        <translation>Sukellus #%d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">valittu sukellus</translation>
+        <translation>valittu sukellus</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">kaikille sukelluksille</translation>
+        <translation>kaikille sukelluksille</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(ei sukelluksia)</translation>
+        <translation>(ei sukelluksia)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">su</translation>
+        <translation>su</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">ma</translation>
+        <translation>ma</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">ti</translation>
+        <translation>ti</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">ke</translation>
+        <translation>ke</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">to</translation>
+        <translation>to</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">pe</translation>
+        <translation>pe</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">la</translation>
+        <translation>la</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">tammi</translation>
+        <translation>tammi</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">helmi</translation>
+        <translation>helmi</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">maalis</translation>
+        <translation>maalis</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">huhti</translation>
+        <translation>huhti</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">touko</translation>
+        <translation>touko</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">kesä</translation>
+        <translation>kesä</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">heinä</translation>
+        <translation>heinä</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">elo</translation>
+        <translation>elo</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">syys</translation>
+        <translation>syys</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">loka</translation>
+        <translation>loka</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">marras</translation>
+        <translation>marras</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">joulu</translation>
+        <translation>joulu</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zurich: tiedostojärjestelmä on lähes täynnä.
+        <translation>Uemis Zurich: tiedostojärjestelmä on lähes täynnä.
 Liitä sukellustietokone uudestaan
 ja yritä uudestaan.</translation>
     </message>
@@ -5431,7 +3031,7 @@ ja yritä uudestaan.</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zurich: Tiedostojärjestelmä on täynnä.
+        <translation>Uemis Zurich: Tiedostojärjestelmä on täynnä.
 Liitä sukellustietokone uudestaan
 ja yritä uudestaan.</translation>
     </message>
@@ -5439,193 +3039,193 @@ ja yritä uudestaan.</translation>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Tiedoston req.txt kirjoittaminen epäonnistui.
+        <translation>Tiedoston req.txt kirjoittaminen epäonnistui.
 Onko Uemis Zurich kytketty oikein?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">tuntematon</translation>
+        <translation>tuntematon</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Luetaan sukellusta %s %s</translation>
+        <translation>Luetaan sukellusta %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">tieto</translation>
+        <translation>tieto</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">id: sukelluslokimerkintä</translation>
+        <translation>id: sukelluslokimerkintä</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">id: lisää sijaintitietoa</translation>
+        <translation>id: lisää sijaintitietoa</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">id: lisää sukellusdataa</translation>
+        <translation>id: lisää sukellusdataa</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">märkäpuku</translation>
+        <translation>märkäpuku</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">puolikuiva</translation>
+        <translation>puolikuiva</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">kuivapuku</translation>
+        <translation>kuivapuku</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">lyhyt</translation>
+        <translation>lyhyt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">liivi</translation>
+        <translation>liivi</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">haalari</translation>
+        <translation>haalari</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">takki</translation>
+        <translation>takki</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">kokopuku</translation>
+        <translation>kokopuku</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">Kaksiosainen kokopuku</translation>
+        <translation>Kaksiosainen kokopuku</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">laminaatti</translation>
+        <translation>laminaatti</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Muodosta yhteys</translation>
+        <translation>Muodosta yhteys</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Uemiksen lukeminen epäonnistui</translation>
+        <translation>Uemiksen lukeminen epäonnistui</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Aloita lataus</translation>
+        <translation>Aloita lataus</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Turvapysähdyksen laiminlyönti</translation>
+        <translation>Turvapysähdyksen laiminlyönti</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Hälytys: nousunopeus</translation>
+        <translation>Hälytys: nousunopeus</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Varoitus: nousunopeus</translation>
+        <translation>Varoitus: nousunopeus</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Varoitus: hapen osapaine (green)</translation>
+        <translation>Varoitus: hapen osapaine (green)</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Varoitus: hapen osapaine</translation>
+        <translation>Varoitus: hapen osapaine</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Hälytys: hapen osapaine</translation>
+        <translation>Hälytys: hapen osapaine</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Tiedotus: säiliöpaine</translation>
+        <translation>Tiedotus: säiliöpaine</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Varoitus: kaasumäärä</translation>
+        <translation>Varoitus: kaasumäärä</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Hälytys: kaasumäärä</translation>
+        <translation>Hälytys: kaasumäärä</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Säiliönvaihtoehdotus</translation>
+        <translation>Säiliönvaihtoehdotus</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Syvyysraja ylitetty</translation>
+        <translation>Syvyysraja ylitetty</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Varoitus: etappipysähdysaika</translation>
+        <translation>Varoitus: etappipysähdysaika</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Tiedotus: sukellusaika</translation>
+        <translation>Tiedotus: sukellusaika</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Hälytys: sukellusaika</translation>
+        <translation>Hälytys: sukellusaika</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">merkki</translation>
+        <translation>merkki</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Ei tietoja säiliöistä</translation>
+        <translation>Ei tietoja säiliöistä</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Varoitus: heikko paristo</translation>
+        <translation>Varoitus: heikko paristo</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Hälytys: heikko paristo</translation>
+        <translation>Hälytys: heikko paristo</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index 61a295281..95741daa7 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -1,2393 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-Aucun événement
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete"> &gt; Mois</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete"> Télécharger</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete">Veuillez choisir un ordinateur de plongée et son périphérique associé.</translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> début</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> fin</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">N°</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s de %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s%2$s %4$d %3$s %5$d,   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d %2$s, %4$d,   %5$dh%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d %2$s %4$d, %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d %2$s %4$d, %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%d j %d h %d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%d h %d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-SNC : %u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-Plafond calculé %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Décompression : %umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Décompression : durée inconnue @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-EAD : %d%s
-END : %d%s
-EADD : %d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-En décompression</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD : %d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL : %umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-P : %d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Arrêt de sécurité : %umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Arrêt de sécurité : durée inconnue @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Subsurface sumilation de plongée
-basé sur un GFlow = %.0f et un GFhigh = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T : %.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe : %.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s : %.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s : %.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s event at %d:%02u</source>
-        <translation type="obsolete">%s événement à %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s: Response from divelogs.de</source>
-        <translation type="obsolete">%s: Réponse de divelogs.de</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) ou (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(cliquer pour modifier la date et l&apos;heure de la plongée)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(cliquer pour modifier la date, l&apos;heure et la profondeur de la plongée)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(pas de plongées)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(rien)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.016 m³/min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.02 m³/min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 l/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 plongées par page</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">Combi 2 pièces</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 l/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">Pas de 3 m pour calculer le plafond</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 plongées par page</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;Add segments below.
-Each line describes part of the planned dive.
-An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. &apos;+3:30&apos;) or ends at the given time (if absolute e.g &apos;@5:00&apos;, &apos;runtime&apos;), and uses the given gas.
-An empty gas means &apos;use previous gas&apos; (or AIR if no gas was specified).
-An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.
-CC SetPoint specifies CC (rebreather) dives, leave empty for OC.&lt;/small&gt;
-</source>
-        <translation type="obsolete">&lt;small&gt;Ajouter des sections ci-dessous.
-Chaque ligne décrit une partie de la plongée prévue.
-Une ligne comprend la profondeur, le temps et le gaz utilisé pendant la section qui se termine à la profondeur désignée, dure le temps prévu (si durée relative : « +3:30 ») ou finit au temps prévu (si la durée est absolue) et utilise la quantité de gaz indiquée.
-Si aucun gaz n&apos;est précisé, cela correspondra à « utiliser le gaz précédant » (ou à AIR si aucun gaz n&apos;a été spécifié).
-Un entrée avec une profondeur et un gaz mais sans durée est particulière ; elle informe le planificateur que le volume de gaz indiqué sera disponible pour la remonté une fois la profondeur indiquée atteinte.
-Les repères CF sont pour les plongées en CF (circuit-fermé, avec recycleur), laisser vide pour les plongées en CO (circuit ouvert).&lt;/small&gt;
-</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">AIR</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">À propos de Subsurface</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Ajouter</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Ajouter une plongée...</translation>
-    </message>
-    <message>
-        <source>Add bookmark event here</source>
-        <translation type="obsolete">Ajouter un signet ici</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Ajouter une plongée</translation>
-    </message>
-    <message>
-        <source>Add gas change event here</source>
-        <translation type="obsolete">Ajouter un changement de mélange ici</translation>
-    </message>
-    <message>
-        <source>Add gaschange event at %d:%02u</source>
-        <translation type="obsolete">Ajouter un changement de mélange à %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Ajouter au groupe au-dessus</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Ajouter des points de cheminement</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Pression athmosphérique</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Temp. atmosphérique</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Temp. atmosphérique en %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Choisir les plongées téléchargées par défaut</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">Avril</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">Août</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Grouper automatiquement</translation>
-    </message>
-    <message>
-        <source>Available gases</source>
-        <translation type="obsolete">Gaz disponibles</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Moyenne</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Moyenne</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Moyenne</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Moyenne</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Profondeur moy.</translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Profondeur moyenne (%s) :</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">Consommation d&apos;air moy.</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Temp. moy.</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Tps moy.</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Passer en CO</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Binôme</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">repère CF</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Impossible de trouver le gaz %d/%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">Impossible d&apos;ouvrir la feuille de style (%s)/%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Annulé, sortie en cours...</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Annulé...</translation>
-    </message>
-    <message>
-        <source>Cannot add gas change</source>
-        <translation type="obsolete">Impossible d&apos;ajouter un changement de mélange</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Impossible de lire la réponse</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Celsius</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Choisissez le fichier XML par défaut</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Choisissez le fichier XML à importer dans les données actuelles</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Fermer</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Tout replier</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Connexion en cours...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Erreur de connexion : </translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Créer un nouveau groupe au-dessus</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">Pieds³</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Blk</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Bloc</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Bloc pour la simulation</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Blocs</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">P : %.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">ATTENTION : CECI EST UNE NOUVELLE IMPLÉMENTATION DE L&apos;ALGORITHME DE BUHLMANN ET LE SIMULATEUR DE PLONGÉE N&apos;A ÉTÉ TESTÉ QUE SOMMAIREMENT. IL EST FORTEMENT CONSEILLÉ DE NE PAS PLONGER EN SE BASANT UNIQUEMENT SUR LES INDICATIONS FOURNIES ICI.</translation>
-    </message>
-    <message>
-        <source>Database connection failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Connexion à la base de données impossible &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Échec de la requête &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query get_events failed.
-</source>
-        <translation type="obsolete">Échec de la requête.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Date</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Date et heure</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Date :</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">Déc.</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">Fichier XML par défaut</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Supprimer un ordinateur de plongée</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Supprimer la plongée</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Supprimer les plongées</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Profondeur</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Profondeur plafond dépassée</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Profondeur :</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Nom du périphérique</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Périphérique ou point de montage</translation>
-    </message>
-    <message>
-        <source>Display invalid dives</source>
-        <translation type="obsolete">Afficher les plongées erronées</translation>
-    </message>
-    <message>
-        <source>Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</source>
-        <extracomment>++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-&lt;trailing text&gt;
-</extracomment>
-        <translation type="obsolete">Plongée n°%1$d - %2$s %4$02d/%3$02d/%5$04d à %6$d:%7$02d %8$s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Plongée n°%d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Plongée n°%d - %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Surnom de l&apos;ordinateur de plongée</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Détails de plongée</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Notes de plongée</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Planificateur de plongée - CECI EST UNE SIMULATION ; NE PAS L&apos;UTILISER POUR PLONGER</translation>
-    </message>
-    <message>
-        <source>Dive Tags</source>
-        <translation type="obsolete">Étiquettes de plongée</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Temps de plongée</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Alerte temps de plongée</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Temps de plongée</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Marque et modèle de l&apos;ordinateur de plongée</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Erreur à l&apos;import des données de plongées</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Lieux</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Chef de palanquée</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Début de la plongée ?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Plongée n°</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Police pour la liste de plongée</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Chef de palanquée</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Plongées</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Lieux</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Télécharger depuis l&apos;ordinateur de plongée</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Télécharger depuis l&apos;ordinateur de plongée...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Télécharger depuis le serveur</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Télécharger depuis le serveur...</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Téléchargement réussi</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Durée</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Durée (min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">E</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">Nitrox%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">Nitrox32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">Nitrox36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Modifier</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Modifier le nom du périphérique</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Modifier le surnom de l&apos;ordinateur de plongée</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Modifier les informations du groupe</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Modifier le résumé du groupe</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Modifier le surnom de l&apos;ordinateur de plongée en faisant un double-clic sur le champ du surnom.</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Modifier la plongée</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Modifier la date et l&apos;heure de la plongée</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Modifier les plongées</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Modifier plusieurs plongées</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Modifier le résumé du groupe</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Activer/désactiver des événements</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Tags</source>
-        <translation type="obsolete">Activer / Désactiver les étiquettes</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Fin</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Profondeur finale</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Entrer l&apos;identifiant de l&apos;utilisateur et appuyer sur « Télécharger ». Une fois le téléchargement complet vous pouvez appuyer sur « Appliquer » si vous voulez appliquer les modifications.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Équipement</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Erreur</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Impossible d&apos;obtenir la salinité de l&apos;eau</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Impossible d&apos;analyser l&apos;heure</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Impossible d&apos;analyser le temps de plongée</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Impossible d&apos;analyser le mélange gazeux</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Impossible d&apos;analyser le nombre de mélange gazeux</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Impossible d&apos;analyser la profondeux maximale</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Impossible d&apos;analyser des échantillons</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Impossible d&apos;enregistrer le gestionnaire d&apos;annulation.</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Impossible d&apos;enregistrer les données</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Impossible d&apos;enregistrer le gestionnaire d&apos;événement.</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Événement : systime=%&lt;PRId64&gt;, devtime=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Événement : attente d&apos;une action de l&apos;utilisateur</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Tout déplier</translation>
-    </message>
-    <message>
-        <source>Export As UDDF File</source>
-        <translation type="obsolete">Exporter comme un fichier UDDF</translation>
-    </message>
-    <message>
-        <source>Export UDDF...</source>
-        <translation type="obsolete">Exporter UDDF...</translation>
-    </message>
-    <message>
-        <source>Export dive(s) to UDDF</source>
-        <translation type="obsolete">Export de plongée(s) vers UDDF</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Impossible d&apos;ouvrir %i fichiers.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Impossible d&apos;analyser « %s »</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Impossible d&apos;analyser « %s ».
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Impossible de la lecture « %s »</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Impossible de lire « %s ».
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">Fév.</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">Pieds</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Fichier</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filtrer</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Forcer le téléchargement de toutes les plongées</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Ven.</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFhaut</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFhaut pour la simulation</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFbas</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFbas pour la simulation</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (format WGS84 ou GPS)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Air utilisé</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Gaz utilisé</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Gaz utilisé</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Consommation de gaz :
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Mélange gazeux</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Préférences générales</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Aide</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">Inactif</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Importer Fichier(s)...</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Informations</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Initialisation de la communication</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Saisir le plan</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Profondeur invalide &quot;%s&quot;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Profondeur invalide - les profondeurs inférieures à 400m ne sont pas supportées</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Gaz invalide ligne %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Heure de début invalide</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Identifiant utilisateur incorrect.</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Janv.</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">Juil.</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">Juin</translation>
-    </message>
-    <message>
-        <source>Last stop at 20 Feet</source>
-        <translation type="obsolete">Dernier arrêt à 20 pieds</translation>
-    </message>
-    <message>
-        <source>Last stop at 6 Meters</source>
-        <translation type="obsolete">Dernier arrêt à 6 mètres</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Options de mise en page</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel et autres, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Liste</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">Litre</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Lieu</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Journal</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Plus longue</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Plongée la plus longue</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Alarme de batterie faible</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Avertissement de batterie faible</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Logiciel de cartographie</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">Mar.</translation>
-    </message>
-    <message>
-        <source>Mark invalid</source>
-        <translation type="obsolete">Trace invalide</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Sélectionner l&apos;emplacement</translation>
-    </message>
-    <message>
-        <source>Mark valid</source>
-        <translation type="obsolete">Trace valide</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Marqueur</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Chef</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Avertissement de temps de décompression max</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Profondeur max.</translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Profondeur maximale (%s) :</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Consommation d&apos;air max.</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Temp. max.</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Profondeur max. : %.*f %s
-Durée : %d min
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">SNC Max.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">PressionMax</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Maximum</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Maximum</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Maximum</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">Mai</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Fusionner les plongées</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Fusionner le groupe avec le groupe au dessus</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Fusionner le groupe avec le groupe en dessous</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">Mètre</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Profondeur min.</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Consommation d&apos;air min.</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Temp. min.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Options diverses</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Modèle</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lun.</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Journal de plongée multi systèmes, écrit en C</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nouveau</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Nouveau numéro de départ</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Ordinateur suivant</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Surnom</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Pas d&apos;information sur le bloc</translation>
-    </message>
-    <message>
-        <source>No cylinders listed for this dive.</source>
-        <translation type="obsolete">Pas de bloc listé pour cette plongée.</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notes</translation>
-    </message>
-    <message>
-        <source>Notes height (%d%% - %d%%)</source>
-        <translation type="obsolete">Hauteur des notes (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Notes en haut</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">Nov.</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">OLF</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">Oct.</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Étrange erreur pthread retournée</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Supprimer cette entrée ?</translation>
-    </message>
-    <message>
-        <source>Only display dives with these tags:</source>
-        <translation type="obsolete">N&apos;afficher que les plongées avec ces étiquettes:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Ouvrir un Fichier</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Ouvrir...</translation>
-    </message>
-    <message>
-        <source>Ordering</source>
-        <translation type="obsolete">Classer</translation>
-    </message>
-    <message>
-        <source>Other data height (%d%% - %d%%)</source>
-        <translation type="obsolete">Hauteur des autres données (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Oxygène</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Alarme PO2 ascendant</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Avertissement PO2 ascendant</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Avertissement PO2 Vert</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">PSI</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Mot de passe</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Sélectionner sur une carte</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Simulateur</translation>
-    </message>
-    <message>
-        <source>Please enter your userid and password for divelogs.de. The selected dives will be added to your account</source>
-        <translation type="obsolete">Entrer vos id et mot de passe pour divelogs.de. Les plongées sélectionnées seront ajoutées à votre compte.</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Préférences</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Préférences...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Pression</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Pression :</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Ordinateur précédent</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">Imprimer en couleur</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Imprimer uniquement les plongées selectionnées</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Imprimer la sélection</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Type d&apos;impression</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Imprimer...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Profil</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Préférences personnelles</translation>
-    </message>
-    <message>
-        <source>Profile height (%d%% - %d%%)</source>
-        <translation type="obsolete">Hauteur du profil (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Profil en haut</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Quitter</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Alerte temps air restant</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Avertissement temps d&apos;air restant</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Évaluation</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Lecture %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Enlever</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Supprimer groupe</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Retirer la plongée du groupe</translation>
-    </message>
-    <message>
-        <source>Remove event here</source>
-        <translation type="obsolete">Retirer un événement ici</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Retirer les plongées sélectionnées du groupe</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Renuméroter</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Renuméroter...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Essayer à nouveau</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">Consommation d&apos;air</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">Consommation d&apos;air pendant la décompression</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">Consommation d&apos;air pendant la plongée</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Violation du palier de sécurité</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sam.</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Enregistrer sous...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Enregistrement des changements ?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Enregistrer le fichier sous</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Enregistrer sous</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Enregistrer...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Fragmenter le temps</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Sélection des événements</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Sélection des événements...</translation>
-    </message>
-    <message>
-        <source>Select Tags...</source>
-        <translation type="obsolete">Sélectionner des étiquettes...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">Sept.</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Écriture partielle des progrès dans le fichier req.txt
-Est-ce que votre Uemis Zurich est branché correctement ?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Plus courte</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Plongée la plus courte</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Afficher les colonnes</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">Afficher EAD, END, EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">Afficher MOD</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Afficher le plafond calculé</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Afficher en rouge le plafond signalé par l&apos;ordinateur</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Afficher sur une carte</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">Afficher le graph pHe</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">Afficher le graph pN%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">Afficher le graph pO%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Plongée simulée</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Taille</translation>
-    </message>
-    <message>
-        <source>Sizing heights (%% of layout)</source>
-        <translation type="obsolete">Hauteurs (%% de la page)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Alarme de vitesse</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Avertissement de vitesse</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Début</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Début du téléchargement</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Statistiques</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Statistiques %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Stats</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Statut</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Rester à %.*f %s pour %d:%02d min - temps %d:%02u sur %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Valeur de pourcentage étrange %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Combinaison</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Dim.</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Tps entre plongées</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Pression en surface (mbar)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Changer pour du gaz %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Impression du tableau</translation>
-    </message>
-    <message>
-        <source>Tags are only shown if they are identical for all edited dives</source>
-        <translation type="obsolete">Les étiquettes ne sont affichées que si elles sont identiques pour toutes les plongées éditées</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Changement de bloc suggéré</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Pression du bloc</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Préférences techniques</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Temp.</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Température</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Température :</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Trois</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Jeu.</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Temps</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Pour modifier les informations d&apos;une plongée
-faites un double-clic sur la plongée dans la liste</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Changer de zoom</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">Trop de gaz différents</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">Trop de points de cheminement</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Total</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Temps total</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Poids total :</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Transition vers %.*f %s en %d:%02d min - temps %d:%02u sur %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Groupe %1$s %3$d %2$s %4$d (%5$d plongée)</numerusform>
-            <numerusform>Groupe %1$s %3$d %2$s %4$d (%5$d plongées)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Mar.</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Type</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zurich : le disque dur est presque plein
-Débranchez puis rebranchez l&apos;ordinateur
-afin d&apos;essayer à nouveau</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zurich : Le disque dur est plein
-Débranchez puis rebranchez l&apos;ordinateur
-afin d&apos;essayer à nouveau</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Impossible d&apos;initialiser Uemis</translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">Impossible de créer un contexte libdivecomputer</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Impossible de créer une analyse pour %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Impossible d&apos;ouvrir %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Unités</translation>
-    </message>
-    <message>
-        <source>Upload dive(s) to divelogs.de</source>
-        <translation type="obsolete">Télécharger plongée(s) vers divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de</source>
-        <translation type="obsolete">Télécharger vers divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de...</source>
-        <translation type="obsolete">Télécharger vers divelogs.de...</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Faites un clic droit pour marquer la position de la plongée au curseur</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Identifiant utilisateur</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Manuel utilisateur</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Vue</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Visibilité</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Volume :</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">O</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Attention - les très longues plongées entraînent de long temps de calcul</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Attention - la simulation de plongées très profondes peut durer un certain temps</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Temp. de l&apos;eau</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Serveur</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mer.</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Poids</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Système de poids</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Poids:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">Fichier XML</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Année</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Statistiques annuelles</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">Vous avez déjà un ordinateur de ce modèle
-nommé %s
-Subsurface peut donner un surnom à ce modèle pour le distinguer du précédant.Le modèle et l&apos;identifiant du périphérique sont montré ci-dessous.
-Si vous ne voulez pas donner un surnom à ce modèle, appuyez sur « Annuler » et Subsurface utilisera son modèle (ce qui peut signifier que vous ne pourrez distinguer les deux ordinateurs).</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Vous avez des changements non enregistrés.
-Souhaitez-vous enregistrer ces changements avant de fermer ?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Vous avez des changements non enregistrés dans le fichier : %s 
-Souhaitez-vous enregistrer ces changements avant de le fermer ?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">air</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">temps d&apos;air</translation>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">altitude</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">cheville</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">ascension</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">poids dorsaux</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">ceinture</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">bateau</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">marque-page</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">grotte</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">grotte</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">plafond</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">plafond (palier de sécurité)</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">clip-on</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">pied³</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">données</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">décompression</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">Arrêt de décompression</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">profondeur</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">Arrêt profond</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">identifiant de l&apos;entrée dans le journal</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">identifiant du site de plongée</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">Temps de plongée</translation>
-    </message>
-    <message>
-        <source>drift</source>
-        <translation type="obsolete">dérivante</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">Combinaison sèche</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">pour toutes les plongées</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">pour la plongée n°%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">pour les plongées n°</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">uniquement la plongée sélectionnée</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">uniquement les plongées sélectionnées</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">eau douce</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">pied</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">Combinaison intégrale</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">Changement de gas</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">entête</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">glace</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">intégré</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">Invalide</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">numéro d&apos;événement non valide</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">gilet</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">Lac</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">livre US</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">salopette de combinaison</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">ppO2 max</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">SNCmax</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">profondeur max</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">membrane</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">min</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">modèle = %u (0x%08x), firmware = %u (0x%08x), port série = %u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">plus d&apos;identifiants de plongée</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">plus de %d jours</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">nuit</translation>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">temps sans arrêt</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">aucun</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">limite pHe</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">limite pN%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">limite pO%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">pascal</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">photo</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">piscine</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">rbt</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">rivière</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">palier de sécurité</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">palier de sécurité (obligatoire)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">palier de sécurité (volontaire)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">semi-étanche</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">rivage</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">shorty</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">surface</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">technique</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">Avertissement de niveau « tissue »</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">entraînement</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">Pierre-Yves Chibon
-Jean-Noël Rouchon
-Stéphane Raimbault
-Kévin Raymond
-Sylvestre Ledru</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">transmetteur</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">inconnu</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">inconnu</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">non spécifié</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">veste</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">vidéo</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">violation</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">poids</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">combinaison humide</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">charge</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">épave</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Temps</translation>
+        <translation>Temps</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Profondeur</translation>
+        <translation>Profondeur</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Temp.</translation>
+        <translation>Temp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2395,57 +77,57 @@ Sylvestre Ledru</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Type</translation>
+        <translation>Type</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Taille</translation>
+        <translation>Taille</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2453,41 +135,41 @@ Sylvestre Ledru</translation>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Modifier le surnom de l&apos;ordinateur de plongée</translation>
+        <translation>Modifier le surnom de l&apos;ordinateur de plongée</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Modèle</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Modèle</translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Surnom</translation>
+        <translation>Surnom</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2495,12 +177,12 @@ Sylvestre Ledru</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2508,95 +190,87 @@ Sylvestre Ledru</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Fusionner le groupe avec le groupe au dessus</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Fusionner le groupe avec le groupe en dessous</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2604,48 +278,48 @@ Sylvestre Ledru</translation>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2653,23 +327,23 @@ Sylvestre Ledru</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2677,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">AIR</translation>
+        <translation>AIR</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Durée</translation>
+        <translation>Durée</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2715,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2733,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">N°</translation>
+        <translation>N°</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Date</translation>
+        <translation>Date</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">pied</translation>
+        <translation>pied</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">min</translation>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">livre US</translation>
+        <translation>livre US</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Combinaison</translation>
+        <translation>Combinaison</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Blk</translation>
+        <translation>Blk</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">Consommation d&apos;air</translation>
+        <translation>Consommation d&apos;air</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">SNCmax</translation>
+        <translation>SNCmax</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Lieu</translation>
+        <translation>Lieu</translation>
     </message>
 </context>
 <context>
@@ -2802,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Erreur</translation>
+        <translation>Erreur</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Essayer à nouveau</translation>
+        <translation>Essayer à nouveau</translation>
     </message>
 </context>
 <context>
@@ -2820,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Télécharger depuis l&apos;ordinateur de plongée</translation>
+        <translation>Télécharger depuis l&apos;ordinateur de plongée</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Forcer le téléchargement de toutes les plongées</translation>
+        <translation>Forcer le téléchargement de toutes les plongées</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2868,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Notes de plongée</translation>
+        <translation>Notes de plongée</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Lieu</translation>
+        <translation>Lieu</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Chef de palanquée</translation>
+        <translation>Chef de palanquée</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Binôme</translation>
+        <translation>Binôme</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Évaluation</translation>
+        <translation>Évaluation</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Visibilité</translation>
+        <translation>Visibilité</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Combinaison</translation>
+        <translation>Combinaison</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Notes</translation>
+        <translation>Notes</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Équipement</translation>
+        <translation>Équipement</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Détails de plongée</translation>
+        <translation>Détails de plongée</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Date</translation>
+        <translation>Date</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">Consommation d&apos;air</translation>
+        <translation>Consommation d&apos;air</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Temps de plongée</translation>
+        <translation>Temps de plongée</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Stats</translation>
+        <translation>Stats</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Profondeur</translation>
+        <translation>Profondeur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Température</translation>
+        <translation>Température</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Durée</translation>
+        <translation>Durée</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Temps total</translation>
+        <translation>Temps total</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Plongées</translation>
+        <translation>Plongées</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Blocs</translation>
+        <translation>Blocs</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -3095,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">inconnu</translation>
+        <translation>inconnu</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">E</translation>
+        <translation>E</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">O</translation>
+        <translation>O</translation>
     </message>
 </context>
 <context>
@@ -3128,417 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Fichier</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Journal</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Vue</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filtrer</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Aide</translation>
+        <translation>Filtrer</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Nouveau</translation>
+        <translation>Nouveau</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauvegarder</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Enregistrer sous</translation>
+        <translation>Enregistrer sous</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Fermer</translation>
+        <translation>Fermer</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Profil</translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Informations</translation>
+        <translation>Informations</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Préférences</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Quitter</translation>
+        <translation>Préférences</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Modifier le nom du périphérique</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Renuméroter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Changer de zoom</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Statistiques annuelles</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Ordinateur précédent</translation>
+        <translation>Ordinateur précédent</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Ordinateur suivant</translation>
+        <translation>Ordinateur suivant</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Sélection des événements</translation>
+        <translation>Sélection des événements</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Saisir le plan</translation>
+        <translation>Saisir le plan</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">À propos de Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Manuel utilisateur</translation>
+        <translation>À propos de Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Ouvrir un Fichier</translation>
+        <translation>Ouvrir un Fichier</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Enregistrement des changements ?</translation>
+        <translation>Enregistrement des changements ?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3548,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3566,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Unités</translation>
+        <translation>Unités</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Plongées</translation>
+        <translation>Plongées</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Profondeur</translation>
+        <translation>Profondeur</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">Mètre</translation>
+        <translation>Mètre</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">Pieds</translation>
+        <translation>Pieds</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Pression</translation>
+        <translation>Pression</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">Litre</translation>
+        <translation>Litre</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">Pieds³</translation>
+        <translation>Pieds³</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Température</translation>
+        <translation>Température</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Celsius</translation>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Fahrenheit</translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Poids</translation>
+        <translation>Poids</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">livre US</translation>
+        <translation>livre US</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3856,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3864,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Plongée n°</translation>
+        <translation>Plongée n°</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Date</translation>
+        <translation>Date</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Profondeur</translation>
+        <translation>Profondeur</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Durée</translation>
+        <translation>Durée</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Chef</translation>
+        <translation>Chef</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Binôme</translation>
+        <translation>Binôme</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Lieu</translation>
+        <translation>Lieu</translation>
     </message>
 </context>
 <context>
@@ -3902,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Imprimer uniquement les plongées selectionnées</translation>
+        <translation>Imprimer uniquement les plongées selectionnées</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">Imprimer en couleur</translation>
+        <translation>Imprimer en couleur</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Type d&apos;impression</translation>
+        <translation>Type d&apos;impression</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 plongées par page</translation>
+        <translation>6 plongées par page</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 plongées par page</translation>
+        <translation>2 plongées par page</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Impression du tableau</translation>
+        <translation>Impression du tableau</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished">Classer</translation>
+        <translation>Classer</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Profil en haut</translation>
+        <translation>Profil en haut</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Notes en haut</translation>
+        <translation>Notes en haut</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3987,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Modifier</translation>
+        <translation>Editer</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">air</translation>
+        <translation>air</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Passer en CO</translation>
+        <translation>Passer en CO</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> début</translation>
+        <translation> début</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> fin</translation>
+        <translation> fin</translation>
     </message>
 </context>
 <context>
@@ -4075,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">inconnu</translation>
+        <translation>inconnu</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Bloc</translation>
+        <translation>Bloc</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Mélange gazeux</translation>
+        <translation>Mélange gazeux</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Gaz utilisé</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">Consommation d&apos;air</translation>
+        <translation>Consommation d&apos;air</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">SNC Max.</translation>
+        <translation>SNC Max.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4138,50 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">AIR</translation>
+        <translation>AIR</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">Nitrox32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">Nitrox36</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Fermer</translation>
+        <translation>Fermer</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Moyenne</translation>
+        <translation>Moyenne</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished">Minimum</translation>
+        <translation>Minimum</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished">Maximum</translation>
+        <translation>Maximum</translation>
     </message>
 </context>
 <context>
@@ -4189,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Renuméroter</translation>
+        <translation>Renuméroter</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Nouveau numéro de départ</translation>
+        <translation>Nouveau numéro de départ</translation>
     </message>
 </context>
 <context>
@@ -4202,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4230,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">À propos de Subsurface</translation>
+        <translation>À propos de Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4258,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Serveur</translation>
+        <translation>Serveur</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Erreur de connexion : </translation>
+        <translation>Erreur de connexion : </translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Identifiant utilisateur incorrect.</translation>
+        <translation>Identifiant utilisateur incorrect.</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Impossible de lire la réponse</translation>
+        <translation>Impossible de lire la réponse</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Téléchargement réussi</translation>
+        <translation>Téléchargement réussi</translation>
     </message>
 </context>
 <context>
@@ -4296,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
@@ -4327,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -4348,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation>ID utilisateur</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Mot de passe</translation>
+        <translation>Mot de passe</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4386,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Type</translation>
+        <translation>Type</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Poids</translation>
+        <translation>Poids</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4405,42 +2031,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">N°</translation>
+        <translation>N°</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4448,7 +2074,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4456,19 +2082,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4476,64 +2102,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">pascal</translation>
+        <translation>pascal</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">pied³</translation>
+        <translation>pied³</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">pied</translation>
+        <translation>pied</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">livre US</translation>
+        <translation>livre US</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) ou (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s %3$d %2$s %4$d, %5$02d:%6$02d</translation>
+        <translation>(%s) ou (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4543,32 +2165,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">air</translation>
+        <translation>air</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">intégré</translation>
+        <translation>intégré</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">ceinture</translation>
+        <translation>ceinture</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">cheville</translation>
+        <translation>cheville</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">poids dorsaux</translation>
+        <translation>poids dorsaux</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">clip-on</translation>
+        <translation>clip-on</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4578,314 +2200,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Impossible de la lecture « %s »</translation>
+        <translation>Impossible de la lecture « %s »</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">aucun</translation>
+        <translation>aucun</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">Arrêt de décompression</translation>
+        <translation>Arrêt de décompression</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">rbt</translation>
+        <translation>rbt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">ascension</translation>
+        <translation>ascension</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">plafond</translation>
+        <translation>plafond</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">charge</translation>
+        <translation>charge</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">transmetteur</translation>
+        <translation>transmetteur</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">violation</translation>
+        <translation>violation</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">marque-page</translation>
+        <translation>marque-page</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">surface</translation>
+        <translation>surface</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">palier de sécurité</translation>
+        <translation>palier de sécurité</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">Changement de gas</translation>
+        <translation>Changement de gas</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">palier de sécurité (volontaire)</translation>
+        <translation>palier de sécurité (volontaire)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">palier de sécurité (obligatoire)</translation>
+        <translation>palier de sécurité (obligatoire)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">Arrêt profond</translation>
+        <translation>Arrêt profond</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">plafond (palier de sécurité)</translation>
+        <translation>plafond (palier de sécurité)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">Temps de plongée</translation>
+        <translation>Temps de plongée</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">profondeur max</translation>
+        <translation>profondeur max</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">OLF</translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">temps d&apos;air</translation>
+        <translation>temps d&apos;air</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">entête</translation>
+        <translation>entête</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">Avertissement de niveau « tissue »</translation>
+        <translation>Avertissement de niveau « tissue »</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">temps sans arrêt</translation>
+        <translation>temps sans arrêt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">numéro d&apos;événement non valide</translation>
+        <translation>numéro d&apos;événement non valide</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Impossible de créer une analyse pour %s %s</translation>
+        <translation>Impossible de créer une analyse pour %s %s</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Impossible d&apos;enregistrer les données</translation>
+        <translation>Impossible d&apos;enregistrer les données</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Impossible d&apos;analyser l&apos;heure</translation>
+        <translation>Impossible d&apos;analyser l&apos;heure</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Plongée n°%d - %s %d %04d</translation>
+        <translation>Plongée n°%d - %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Impossible d&apos;analyser le temps de plongée</translation>
+        <translation>Impossible d&apos;analyser le temps de plongée</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Impossible d&apos;analyser la profondeux maximale</translation>
+        <translation>Impossible d&apos;analyser la profondeux maximale</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Impossible d&apos;analyser le nombre de mélange gazeux</translation>
+        <translation>Impossible d&apos;analyser le nombre de mélange gazeux</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Impossible d&apos;obtenir la salinité de l&apos;eau</translation>
+        <translation>Impossible d&apos;obtenir la salinité de l&apos;eau</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Impossible d&apos;analyser le mélange gazeux</translation>
+        <translation>Impossible d&apos;analyser le mélange gazeux</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Impossible d&apos;analyser des échantillons</translation>
+        <translation>Impossible d&apos;analyser des échantillons</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Événement : attente d&apos;une action de l&apos;utilisateur</translation>
+        <translation>Événement : attente d&apos;une action de l&apos;utilisateur</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">modèle = %u (0x%08x), firmware = %u (0x%08x), port série = %u (0x%08x)</translation>
+        <translation>modèle = %u (0x%08x), firmware = %u (0x%08x), port série = %u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Impossible d&apos;enregistrer le gestionnaire d&apos;événement.</translation>
+        <translation>Impossible d&apos;enregistrer le gestionnaire d&apos;événement.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Impossible d&apos;enregistrer le gestionnaire d&apos;annulation.</translation>
+        <translation>Impossible d&apos;enregistrer le gestionnaire d&apos;annulation.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Erreur à l&apos;import des données de plongées</translation>
+        <translation>Erreur à l&apos;import des données de plongées</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">Impossible de créer un contexte libdivecomputer</translation>
+        <translation>Impossible de créer un contexte libdivecomputer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Impossible d&apos;ouvrir %s %s (%s)</translation>
+        <translation>Impossible d&apos;ouvrir %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Valeur de pourcentage étrange %s
+        <translation>Valeur de pourcentage étrange %s
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Impossible d&apos;analyser « %s ».
+        <translation>Impossible d&apos;analyser « %s ».
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Impossible d&apos;analyser « %s »</translation>
+        <translation>Impossible d&apos;analyser « %s »</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished">Échec de la requête.
+        <translation>Échec de la requête.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished">Connexion à la base de données impossible &apos;%s&apos;.
+        <translation>Connexion à la base de données impossible &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished">Échec de la requête &apos;%s&apos;.
+        <translation>Échec de la requête &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">Impossible d&apos;ouvrir la feuille de style (%s)/%s</translation>
+        <translation>Impossible d&apos;ouvrir la feuille de style (%s)/%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">Nitrox%d</translation>
+        <translation>Nitrox%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Impossible de trouver le gaz %d/%d</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Bloc pour la simulation</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Plongée simulée</translation>
+        <translation>Impossible de trouver le gaz %d/%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">Trop de gaz différents</translation>
+        <translation>Trop de gaz différents</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4894,7 +2508,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Subsurface sumilation de plongée
 basé sur un GFlow = %.0f et un GFhigh = %.0f
 
@@ -4904,166 +2518,162 @@ basé sur un GFlow = %.0f et un GFhigh = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Transition vers %.*f %s en %d:%02d min - temps %d:%02u sur %s
+        <translation>Transition vers %.*f %s en %d:%02d min - temps %d:%02u sur %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Rester à %.*f %s pour %d:%02d min - temps %d:%02u sur %s
+        <translation>Rester à %.*f %s pour %d:%02d min - temps %d:%02u sur %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Changer pour du gaz %s
+        <translation>Changer pour du gaz %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Consommation de gaz :
+        <translation>Consommation de gaz :
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s de %s
+        <translation>%.0f%s de %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">P : %.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 P : %d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T : %.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Plafond calculé %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Arrêt de sécurité : %umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Arrêt de sécurité : durée inconnue @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Décompression : %umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Décompression : durée inconnue @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 En décompression</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL : %umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 SNC : %u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s : %.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s : %.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe : %.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD : %d%s</translation>
     </message>
     <message>
@@ -5072,7 +2682,7 @@ MOD : %d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 EAD : %d%s
 END : %d%s
 EADD : %d%s</translation>
@@ -5081,352 +2691,336 @@ EADD : %d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">Invalide</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">bateau</translation>
+        <translation>bateau</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">rivage</translation>
+        <translation>rivage</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished">dérivante</translation>
+        <translation>dérivante</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">profondeur</translation>
+        <translation>profondeur</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">grotte</translation>
+        <translation>grotte</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">glace</translation>
+        <translation>glace</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">épave</translation>
+        <translation>épave</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">grotte</translation>
+        <translation>grotte</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">altitude</translation>
+        <translation>altitude</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">piscine</translation>
+        <translation>piscine</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">Lac</translation>
+        <translation>Lac</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">rivière</translation>
+        <translation>rivière</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">nuit</translation>
+        <translation>nuit</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">eau douce</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">entraînement</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">technique</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">photo</translation>
+        <translation>photo</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">vidéo</translation>
+        <translation>vidéo</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">décompression</translation>
+        <translation>décompression</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">plus de %d jours</translation>
+        <translation>plus de %d jours</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%d j %d h %d min</translation>
+        <translation>%d j %d h %d min</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%d h %d min</translation>
+        <translation>%d h %d min</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">pour les plongées n°</translation>
+        <translation>pour les plongées n°</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">uniquement les plongées sélectionnées</translation>
+        <translation>uniquement les plongées sélectionnées</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">pour la plongée n°%d</translation>
+        <translation>pour la plongée n°%d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">uniquement la plongée sélectionnée</translation>
+        <translation>uniquement la plongée sélectionnée</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">pour toutes les plongées</translation>
+        <translation>pour toutes les plongées</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(pas de plongées)</translation>
+        <translation>(pas de plongées)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">Dim.</translation>
+        <translation>Dim.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">Lun.</translation>
+        <translation>Lun.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">Mar.</translation>
+        <translation>Mar.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">Mer.</translation>
+        <translation>Mer.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">Jeu.</translation>
+        <translation>Jeu.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">Ven.</translation>
+        <translation>Ven.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">Sam.</translation>
+        <translation>Sam.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">Janv.</translation>
+        <translation>Janv.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">Fév.</translation>
+        <translation>Fév.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">Mar.</translation>
+        <translation>Mar.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">Avril</translation>
+        <translation>Avril</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">Mai</translation>
+        <translation>Mai</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">Juin</translation>
+        <translation>Juin</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">Juil.</translation>
+        <translation>Juil.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">Août</translation>
+        <translation>Août</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">Sept.</translation>
+        <translation>Sept.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">Oct.</translation>
+        <translation>Oct.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">Nov.</translation>
+        <translation>Nov.</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">Déc.</translation>
+        <translation>Déc.</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zurich : le disque dur est presque plein
+        <translation>Uemis Zurich : le disque dur est presque plein
 Débranchez puis rebranchez l&apos;ordinateur
 afin d&apos;essayer à nouveau</translation>
     </message>
@@ -5435,7 +3029,7 @@ afin d&apos;essayer à nouveau</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zurich : Le disque dur est plein
+        <translation>Uemis Zurich : Le disque dur est plein
 Débranchez puis rebranchez l&apos;ordinateur
 afin d&apos;essayer à nouveau</translation>
     </message>
@@ -5443,193 +3037,193 @@ afin d&apos;essayer à nouveau</translation>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Écriture partielle des progrès dans le fichier req.txt
+        <translation>Écriture partielle des progrès dans le fichier req.txt
 Est-ce que votre Uemis Zurich est branché correctement ?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">inconnu</translation>
+        <translation>inconnu</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Lecture %s %s</translation>
+        <translation>Lecture %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">données</translation>
+        <translation>données</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">identifiant de l&apos;entrée dans le journal</translation>
+        <translation>identifiant de l&apos;entrée dans le journal</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">identifiant du site de plongée</translation>
+        <translation>identifiant du site de plongée</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">plus d&apos;identifiants de plongée</translation>
+        <translation>plus d&apos;identifiants de plongée</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">combinaison humide</translation>
+        <translation>combinaison humide</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">semi-étanche</translation>
+        <translation>semi-étanche</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">Combinaison sèche</translation>
+        <translation>Combinaison sèche</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">shorty</translation>
+        <translation>shorty</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">veste</translation>
+        <translation>veste</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">salopette de combinaison</translation>
+        <translation>salopette de combinaison</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">gilet</translation>
+        <translation>gilet</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">Combinaison intégrale</translation>
+        <translation>Combinaison intégrale</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">Combi 2 pièces</translation>
+        <translation>Combi 2 pièces</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">membrane</translation>
+        <translation>membrane</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Initialisation de la communication</translation>
+        <translation>Initialisation de la communication</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Impossible d&apos;initialiser Uemis</translation>
+        <translation>Impossible d&apos;initialiser Uemis</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Début du téléchargement</translation>
+        <translation>Début du téléchargement</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Violation du palier de sécurité</translation>
+        <translation>Violation du palier de sécurité</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Alarme de vitesse</translation>
+        <translation>Alarme de vitesse</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Avertissement de vitesse</translation>
+        <translation>Avertissement de vitesse</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Avertissement PO2 Vert</translation>
+        <translation>Avertissement PO2 Vert</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Avertissement PO2 ascendant</translation>
+        <translation>Avertissement PO2 ascendant</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Alarme PO2 ascendant</translation>
+        <translation>Alarme PO2 ascendant</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Pression du bloc</translation>
+        <translation>Pression du bloc</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Avertissement temps d&apos;air restant</translation>
+        <translation>Avertissement temps d&apos;air restant</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Alerte temps air restant</translation>
+        <translation>Alerte temps air restant</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Changement de bloc suggéré</translation>
+        <translation>Changement de bloc suggéré</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Profondeur plafond dépassée</translation>
+        <translation>Profondeur plafond dépassée</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Avertissement de temps de décompression max</translation>
+        <translation>Avertissement de temps de décompression max</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Temps de plongée</translation>
+        <translation>Temps de plongée</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Alerte temps de plongée</translation>
+        <translation>Alerte temps de plongée</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Marqueur</translation>
+        <translation>Marqueur</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Pas d&apos;information sur le bloc</translation>
+        <translation>Pas d&apos;information sur le bloc</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Avertissement de batterie faible</translation>
+        <translation>Avertissement de batterie faible</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Alarme de batterie faible</translation>
+        <translation>Alarme de batterie faible</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts
index f06e824c4..5c672106f 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -1,2373 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="hr_HR">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-Nema događaja
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete"> &gt; Mjesec</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete"> preuzimanje</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete">Odaberite ronilačko računalo i naziv uređaja.</translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> započni</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> završi</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">Br.</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s%2$s %4$d. %3$s %5$d   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d   %5$dh%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dd %dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dst %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-Izračunati strop %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deko:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deko:nepoznato vrijeme @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-U deko</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL:%umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-D:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Sigurnosni zastanak:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Sigurnosni zastoj:nepoz.vrijeme @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Subsurface plan urona
-temeljen na GFlow = %.0f i GFhigh = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s event at %d:%02u</source>
-        <translation type="obsolete">%s događaj pri (%d:%02u)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s: Response from divelogs.de</source>
-        <translation type="obsolete">%s: Odgovor od divelogs.de</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) ili (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(klikni za izmjenu datuma/vremena)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(klikni za izmjenu datuma/vremena/dubine)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(nema urona)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(nema)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 cu.ft./min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 cu.ft./min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 l/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 urona po stranici</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">dvodjelno odijelo</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 l/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">Inkrementi od 3m za izračun deko zastoja</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 urona po stranici</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;Add segments below.
-Each line describes part of the planned dive.
-An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. &apos;+3:30&apos;) or ends at the given time (if absolute e.g &apos;@5:00&apos;, &apos;runtime&apos;), and uses the given gas.
-An empty gas means &apos;use previous gas&apos; (or AIR if no gas was specified).
-An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.
-CC SetPoint specifies CC (rebreather) dives, leave empty for OC.&lt;/small&gt;
-</source>
-        <translation type="obsolete">&lt;small&gt;Ovdje dodaj segmente urona.
-Svaka linija opisuje segment planiranog urona.
-Zapis s zadanom dubinom, vremenom i količinom plina opisuje segment koji završava na zadanoj dubini, u danom vremenu (ako je unesena apsolutna vrijednost) ili traje zadano vrijeme (ako je unesena relativna vrijednost, npr &apos;+3:30&apos;) i iskorištava zadanu količinu plina.
-Ako plin nije zadan, koristit će se prethodna vrijednost (ili vrijednost za Zrak ako za plin nije specificirana).
-Zapis koji ima zadanu dubinu i plin, ali nema vrijeme je poseban; informira osobu koja planira da je zadana količina plina dostupna za izron u trenutku kad je dosegnuta zadana dubina.
-CC SetPoint specificira CC (rebreather) urone, ostaviti prazno za OC.&lt;/small&gt;
-</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">Zrak</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">O programu Subsurface</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Dodaj</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Dodaj uron...</translation>
-    </message>
-    <message>
-        <source>Add bookmark event here</source>
-        <translation type="obsolete">Dodaj oznaku ovdje</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Dodaj uron</translation>
-    </message>
-    <message>
-        <source>Add gas change event here</source>
-        <translation type="obsolete">Dodaj promjenu plina</translation>
-    </message>
-    <message>
-        <source>Add gaschange event at %d:%02u</source>
-        <translation type="obsolete">Dodaj promjenu plina u %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Dodaj u gornju grupu</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Dodaj međutočku</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Pritisak zraka</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Temp. zraka</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Temp. zraka u %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Uvijek preferiraj preuzete urone</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">Tra</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">Kol</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Automatsko grupiranje</translation>
-    </message>
-    <message>
-        <source>Available gases</source>
-        <translation type="obsolete">Dostupni plinovi</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Prosj. dubina</translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Prosj. dubina (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">Prosj. SAC</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Prosj. temp.</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Prosj. trajanje</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Neplanirani prelazak na OC sustav</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">Bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Buddy</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CC SetPoint</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Ne mogu naći plin %d/%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">Ne mogu otvoriti stylesheet (%s)/%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Otkazano, izlazak</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Otkazano</translation>
-    </message>
-    <message>
-        <source>Cannot add gas change</source>
-        <translation type="obsolete">Ne mogu dodati promjenu plina</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Ne mogu obraditi odziv</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Celzijusa</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Odaberi defaultnu XML datoteku</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Odaberi XML datoteke za uvoz u trenutačnu datoteku</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Zatvori</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Zatvori sve grupe</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Spajanje...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Greška u komunikaciji: </translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Kreiraj novu grupu iznad</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">CuFt</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Boca</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Boca</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Boca za planiranje</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Boce</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">UPOZORENJE: OVO JE NOVA IMPLEMENTACIJA BUHLMANN ALGORITMA I PLANERA TEMELJENOG NA NJEMU KOJA JE SAMO DJELOMIČNO TESTIRANA. NIKAKO SE NE PREPORUČA PLANIRANJE URONA TEMELJEM SAMO OVIH INFORMACIJA.</translation>
-    </message>
-    <message>
-        <source>Database connection failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Neuspjelo spajanje na bazu &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Neuspjeo upit na bazu &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query get_events failed.
-</source>
-        <translation type="obsolete">Neuspjeo get_events na bazi.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Datum i vrijeme</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Datum:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">Pro</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">Defaultna XML datoteka</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Obriši zapis o računalu za ronjenje</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Obriši uron</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Obriši urone</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Dubina</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Premašeno ograničenje dubine</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Dubina:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Naziv uređaja</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Uređaj ili mount lokacija</translation>
-    </message>
-    <message>
-        <source>Display invalid dives</source>
-        <translation type="obsolete">Prikaži neispravne urone</translation>
-    </message>
-    <message>
-        <source>Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</source>
-        <extracomment>++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-&lt;trailing text&gt;
-</extracomment>
-        <translation type="obsolete">Uron #%1$d - %2$s %4$02d.%3$02d.%5$04d u %6$d:%7$02d %8$s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Uron #%d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Uron #%d - %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Informacije o uronu</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Bilješke</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Plan urona - OVO JE SAMO SIMULACIJA; NE KORISTITI ZA RONJENJE</translation>
-    </message>
-    <message>
-        <source>Dive Tags</source>
-        <translation type="obsolete">Oznake urona</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Trajanje</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Alarm: Trajanje urona</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Info: Trajanje urona</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Proizvođač i model računala za ronjenje</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Greška pri uvozu podataka</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Bilješke</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Voditelj</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Kada počinje uron?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Uron br.</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Font za listu urona</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Voditelj</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Uroni</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Lokacije urona</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Preuzmi s ronilačkog računala</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Preuzmi s ronilačkog računala...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Preuzmi s web servisa</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Preuzmi s web servisa...</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Preuzimanje uspješno!</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Trajanje</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Trajanje (min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">E</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Uredi</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Naziv uređaja</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Promijeni nazive računala</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Uredi informacije o grupi</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Uredi sažetak grupe</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Uredite ime računala duplim klikom u odgovarajuće polje za naziv računala</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Uredi uron</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Uredi uron</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Uredi urone</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Uredi više urona</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Uredi sažetak urona</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Uključi/isključi događaje</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Tags</source>
-        <translation type="obsolete">Uključi / isključi oznake</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Kraj</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Krajnja dubina</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Unesite korisničku oznaki i pritisnite &apos;Preuzimanje&apos;. Kad se preuzimanje završi možete pritisnuti &apos;Primjeni&apos; ako želite primjeniti promjene.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Oprema</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Greška</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Greška pri dohvaćanju saliniteta vode</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Greška pri parsiranju datuma i vremena</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Greška pri parsiranju vremena urona</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Greška pri parsiranju mješavine plinova</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Greška pri parsiranju broja mješavina</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Greška pri parsiranju maksimalne dubine</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Greška pri parsiranju uzoraka</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Greška pri registraciji cancellation handlera</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Greška pri registraciji podataka</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Greška pri registraciji event handlera.</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Događaj: systime=%&lt;PRId64&gt;, devtime=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Događaj: čekanje na korisničku akciju</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Otvori sve</translation>
-    </message>
-    <message>
-        <source>Export As UDDF File</source>
-        <translation type="obsolete">Izvezi kao UDDF datoteku</translation>
-    </message>
-    <message>
-        <source>Export UDDF...</source>
-        <translation type="obsolete">UDDF izvoz...</translation>
-    </message>
-    <message>
-        <source>Export dive(s) to UDDF</source>
-        <translation type="obsolete">Izvezi uron(e) u UDDF</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Nije uspjelo otvaranje %i datoteka</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Nije uspjelo parsiranje &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Nije uspjelo parsiranje &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Nije uspjelo čitanje &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Nije uspjelo čitanje &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">Velj</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">Stope</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Datoteka</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filter</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Prisilno preuzimanje svih urona</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pet</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFhigh</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFhigh za plan urona</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFlow</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFlow za plan urona</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (WGS84 ili GPS format)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Potrošeno plina</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Potrošeno plina</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Potrošeno plina</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Potrošnja plina:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Mješavina</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Glavne postavke</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Pomoć</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">U mirovanju</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Uvezi datoteku...</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Informacije</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Uspostavljanje veze</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Unesi plan urona</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Neispravna dubina - greška u parsiranju &quot;%s&quot;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Greška u dubini - vrijednosti veće od 400m nisu podržane</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Neispravan plin za redak %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Neispravno vrijeme početka</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Neispravna korisnička oznaka</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Sij</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">Srp</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">Lip</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Postavke prikaza</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel i drugi, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Popis</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">Litra</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Lokacija</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Dnevnik</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Maks.</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Najduži uron</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Alarm: Baterija pri izmaku</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Upozorenje: Baterija pri izmaku</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Davatelj karte</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">Ožu</translation>
-    </message>
-    <message>
-        <source>Mark invalid</source>
-        <translation type="obsolete">Označi kao neispravno</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Označi ovu lokaciju</translation>
-    </message>
-    <message>
-        <source>Mark valid</source>
-        <translation type="obsolete">Označi kao ispravno</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Oznaka</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Master</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Upozorenje: Max. vrijeme dekompresije</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Max dubina</translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Max dubina (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Max SAC</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Max temp.</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Najveća dubina: %.*f %s
-Trajanje: %d min
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Max CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Max pritisak</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Max.</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Max.</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Max.</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">Svi</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Spoji urone</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Spoji s grupom iznad</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Spoji s grupom ispod</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">Metar</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Min dubina</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Min SAC</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Min temp.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Min.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Min.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Min.</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Ostale postavke</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Model</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Pon</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Višeplatformski program za vođenje ronilačkog dnevnika pisan u C-u</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Novi</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Novi početni broj</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Sljedeće računalo</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Naziv uređaja</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Nema podatka o boci</translation>
-    </message>
-    <message>
-        <source>No cylinders listed for this dive.</source>
-        <translation type="obsolete">Niti jedna boca nije odabrana za ovaj uron.</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Bilješke</translation>
-    </message>
-    <message>
-        <source>Notes height (%d%% - %d%%)</source>
-        <translation type="obsolete">Bilješke visina (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Bilješke na vrhu</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">Stu</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">OLF</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">Lis</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Nepoznata greška</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Obrisati odabrani zapis?</translation>
-    </message>
-    <message>
-        <source>Only display dives with these tags:</source>
-        <translation type="obsolete">Prikaži samo urone sa ovim oznakama:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Otvori datoteku</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Otvori...</translation>
-    </message>
-    <message>
-        <source>Ordering</source>
-        <translation type="obsolete">Redosljed</translation>
-    </message>
-    <message>
-        <source>Other data height (%d%% - %d%%)</source>
-        <translation type="obsolete">Visina drugih podataka (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Kisik</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Alarm: Prebrzi izron / PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Upozorenje: Prebrzi izron / PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Upozorenje: PO2 Zeleno</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">PSI</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Lozinka</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Odaberi na karti</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Planer</translation>
-    </message>
-    <message>
-        <source>Please enter your userid and password for divelogs.de. The selected dives will be added to your account</source>
-        <translation type="obsolete">Unesite korisničku oznaku i lozinku za divelogs.de. Odabrani uroni bit će dodani u vaš korisnički račun.</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Postavke</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Postavke...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Pritisak</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Pritisak:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Prethodno računalo</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">Ispis u boji</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Ispiši odabrane urone</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Ispiši odabrano</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Vrsta ispisa</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Ispis...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Profil</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Postavke profila</translation>
-    </message>
-    <message>
-        <source>Profile height (%d%% - %d%%)</source>
-        <translation type="obsolete">Visina profila (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Profil na vrhu</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Izlaz</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">RGT Alarm</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">RTG Upozorenje</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Ocjena</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Čitanje %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Ukloni</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Obriši grupu</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Ukloni uron iz grupe</translation>
-    </message>
-    <message>
-        <source>Remove event here</source>
-        <translation type="obsolete">Obriši događaj</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Ukloni odabrane urone iz grupe</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Renumeriraj</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Renumeriraj...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Pokušaj ponovo</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">SAC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">SAC tijekom dekompresijske stanke</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">SAC tijekom urona</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Kršenje sigurnosne stanke</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sub</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Spremi kao...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Spremi promjene?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Spremi datoteku kao</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Spremi kao</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Spremi...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Trajanje segmenta</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Odaberi događaje</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Odaberi događaje...</translation>
-    </message>
-    <message>
-        <source>Select Tags...</source>
-        <translation type="obsolete">Odaberi oznake...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">Ruj</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Greška pri pisanju u datoteku req.txt
-Je li Uemis Zurich ispravno priključen?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Min.</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Najkraći uron</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Prikaži stupce</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">Prikaži  EAD, END, EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">Prikaži MOD</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Prikaži izračunati limit</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Prikaži limit prijavljen od računala u crvenom</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Prikaži na karti</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">Prikaži pHe graf</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">Prikaži pN%s graf</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">Prikaži pO%s graf</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simulirani uron</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Veličina</translation>
-    </message>
-    <message>
-        <source>Sizing heights (%% of layout)</source>
-        <translation type="obsolete">Dimenzioniranje visine (%% od prikaza)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Alarm: Brzina</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Upozorenje: Brzina</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Početak</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Započni preuzimanje</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Statistika</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Statistike %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Statistike</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Status</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Stanka na %.*f %s u trajanju %d:%02d min - Ukupno vrijeme %d:%02u na %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Neobično očitanje postotka %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Odijelo</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Ned</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Površinski interval</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Površinski pritisak (mbar)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Prebaci plin na %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Tablični ispis</translation>
-    </message>
-    <message>
-        <source>Tags are only shown if they are identical for all edited dives</source>
-        <translation type="obsolete">Oznake su prikazane samo ako su iste za sve urone koji se uređuju</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Preporučena izmjena boce</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Podaci od pritisku u boci</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Tec postavke</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Temp</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Temperatura</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Temperatura:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Tri</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Čet</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Vrijeme</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Duplo klikni na uron u popisu kako
-bi uredio podatke o uronu</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Uključi/isključi povećanje</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">Previše mješavina plinova</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">Previše međutočaka</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Ukupno</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Ukupno trajanje</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Ukupna težina:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Prelazak na %.*f %s u %d:%02d min - ukupno vrijeme %d:%02u na %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Grupa %1$s, %3$d. %2$s %4$d (%5$d uron)</numerusform>
-            <numerusform>Grupa %1$s, %3$d. %2$s %4$d (%5$d urona)</numerusform>
-            <numerusform>Grupa %1$s, %3$d. %2$s %4$d (%5$d urona)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Uto</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Vrsta</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zurich: Datotečni sustav je skoro pun
-odspojite pa ponovo spojite ronilačko računalo
-i kliknite &apos;Retry&apos;</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zurich: Datotečni sustav je pun
-Iskopčajte i ponovo ukopčajte ronilačko računalo
-i pokušajte ponovo.</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Uemis greška pri inicijalizaciji</translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">Ne mogu kreirati libdivecomputer kontekst</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Ne mogu kreirati parser za %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Nije uspjelo otvaranje %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Jedinice</translation>
-    </message>
-    <message>
-        <source>Upload dive(s) to divelogs.de</source>
-        <translation type="obsolete">Upload urona na divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de</source>
-        <translation type="obsolete">Upload na divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de...</source>
-        <translation type="obsolete">Upload na divelogs.de...</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Desnim klikom označite lokaciju kod kurzora</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Korisnička oznaka</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Korisnički priručnik</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Pregled</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Vidljivost</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Zapremnina:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">W</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Upozorenje - jako dugi uroni mogu izrokovati dugo trajanje proračuna</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Upozorenje - planiranje jako dubokih urona može trajati veoma dugo</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Temperatura vode</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Web servis</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Sri</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Težina</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Težina</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Težina:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">XML datoteka</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Godina</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Godišnje statistike</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">Već imate ronilačko računalo ovog modela nazvano %s
-Subsurface može dodijeliti kratki naziv ovom uređaju kako biste ga razlikovali od postojećeg uređaja. Defaultni naziv je model i ID uređaja kao što je prikazano ispod.
-Ako ne želite imenovati ronilačko računalo pritisnite &apos;Otkaži&apos; i Subsurface će prikazati model i naziv uređaja (što znači da nećete moći razlikovati ta dva uređaja u dnevnicima).</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Imate promjena koje nisu spremljene
-Želite li ih spremiti prije zatvaranja datoteke?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Imate promjena koje nisu spremljene u datoteci: %s 
-Želite li ih spremiti prije zatvaranja datoteke?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">zrak</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">preostalo trajanje zraka</translation>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">nadmorska visina</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">gležanj</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">izron</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">backplate olova</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">pojas</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">brod</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">bookmark</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">špilja</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">pećina</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">strop</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">strop (sigurnosni zastoj)</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">clip-on</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">cuft</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">podaci</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">deko zastoj</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">dubok</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">dubinska stanka</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">ID unosa u dnevniku</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">divespot data id</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">trajanje urona</translation>
-    </message>
-    <message>
-        <source>drift</source>
-        <translation type="obsolete">drift</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">suho odijelo</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">za sve urone</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">za uron #%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">za urone #</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">za odabrani uron</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">za odabrane urone</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">slatka voda</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">ft</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">puno odijelo</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">promjena plina</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">kurs</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">led</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">integrirani</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">neispravan</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">neispravan broj događaja</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">kompenzator plovnosti</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">jezero</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">lbs</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">long john</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">max ppO2</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">maxCNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">Max dubina</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">membrana</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">min</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">više podataka za ID urona</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">više od %d dana</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">noć</translation>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">non stop vrijeme</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">nijedan</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">pHe prag</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">pN%s prag</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">pO%s prag</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">Pa</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">fotografija</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">bazen</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">rbt</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">rijeka</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">sigurnosna stanka</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">sigurnosna stanka (obavezna)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">sigurnosna stanka (opcionalna)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">polusuho</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">obala</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">shorty</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">površina</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">poduka</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">upozorenje tkivo</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">trening</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">Ivan Habunek</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">odašiljač</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">nepoznat</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">nepoznato</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">nije specificirano</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">jakna</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">video</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">povreda</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">težina</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">mokro odijelo</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">opterećenje</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">olupina</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="hr_HR" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Vrijeme</translation>
+        <translation>Vrijeme</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Dubina</translation>
+        <translation>Dubina</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Temp</translation>
+        <translation>Temp</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2375,57 +77,57 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Vrsta</translation>
+        <translation>Vrsta</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Veličina</translation>
+        <translation>Veličina</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2433,41 +135,41 @@ tranlators here
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Promijeni nazive računala</translation>
+        <translation>Promijeni nazive računala</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Model</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Model</translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Naziv uređaja</translation>
+        <translation>Naziv uređaja</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2475,12 +177,12 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2488,95 +190,87 @@ tranlators here
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Spoji s grupom iznad</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Spoji s grupom ispod</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2584,48 +278,48 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2633,23 +327,23 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2657,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">Zrak</translation>
+        <translation>Zrak</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Trajanje</translation>
+        <translation>Trajanje</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2695,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2713,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">Br.</translation>
+        <translation>Br.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">min</translation>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Odijelo</translation>
+        <translation>Odijelo</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Boca</translation>
+        <translation>Boca</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">maxCNS</translation>
+        <translation>maxCNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Lokacija</translation>
+        <translation>Lokacija</translation>
     </message>
 </context>
 <context>
@@ -2782,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Greška</translation>
+        <translation>Greška</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Pokušaj ponovo</translation>
+        <translation>Pokušaj ponovo</translation>
     </message>
 </context>
 <context>
@@ -2800,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Preuzmi s ronilačkog računala</translation>
+        <translation>Preuzmi s ronilačkog računala</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Prisilno preuzimanje svih urona</translation>
+        <translation>Prisilno preuzimanje svih urona</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2848,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Bilješke</translation>
+        <translation>Bilješke</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Lokacija</translation>
+        <translation>Lokacija</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Voditelj</translation>
+        <translation>Voditelj</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Buddy</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Ocjena</translation>
+        <translation>Ocjena</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Vidljivost</translation>
+        <translation>Vidljivost</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Odijelo</translation>
+        <translation>Odijelo</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Bilješke</translation>
+        <translation>Bilješke</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Oprema</translation>
+        <translation>Oprema</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Informacije o uronu</translation>
+        <translation>Informacije o uronu</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Trajanje</translation>
+        <translation>Trajanje</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Statistike</translation>
+        <translation>Statistike</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Dubina</translation>
+        <translation>Dubina</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatura</translation>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Trajanje</translation>
+        <translation>Trajanje</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Ukupno trajanje</translation>
+        <translation>Ukupno trajanje</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Uroni</translation>
+        <translation>Uroni</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Boce</translation>
+        <translation>Boce</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -3075,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">nepoznato</translation>
+        <translation>nepoznato</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">E</translation>
+        <translation>E</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">W</translation>
+        <translation>W</translation>
     </message>
 </context>
 <context>
@@ -3108,417 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Datoteka</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Dnevnik</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Pregled</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Pomoć</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Novi</translation>
+        <translation>Novi</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Spremi kao</translation>
+        <translation>Spremi kao</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Zatvori</translation>
+        <translation>Zatvori</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Profil</translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Informacije</translation>
+        <translation>Informacije</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Postavke</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Izlaz</translation>
+        <translation>Postavke</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Naziv uređaja</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Renumeriraj</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Uključi/isključi povećanje</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Godišnje statistike</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Prethodno računalo</translation>
+        <translation>Prethodno računalo</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Sljedeće računalo</translation>
+        <translation>Sljedeće računalo</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Odaberi događaje</translation>
+        <translation>Odaberi događaje</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Unesi plan urona</translation>
+        <translation>Unesi plan urona</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">O programu Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Korisnički priručnik</translation>
+        <translation>O programu Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Otvori datoteku</translation>
+        <translation>Otvori datoteku</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Spremi promjene?</translation>
+        <translation>Spremi promjene?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3528,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3546,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Jedinice</translation>
+        <translation>Jedinice</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Uroni</translation>
+        <translation>Uroni</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Dubina</translation>
+        <translation>Dubina</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">Metar</translation>
+        <translation>Metar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">Stope</translation>
+        <translation>Stope</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Pritisak</translation>
+        <translation>Pritisak</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <translation>Bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">Litra</translation>
+        <translation>Litra</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">CuFt</translation>
+        <translation>CuFt</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatura</translation>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Celzijusa</translation>
+        <translation>Celzijusa</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Fahrenheit</translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Težina</translation>
+        <translation>Težina</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3836,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3844,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Uron br.</translation>
+        <translation>Uron br.</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Dubina</translation>
+        <translation>Dubina</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Trajanje</translation>
+        <translation>Trajanje</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Master</translation>
+        <translation>Master</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Buddy</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Lokacija</translation>
+        <translation>Lokacija</translation>
     </message>
 </context>
 <context>
@@ -3882,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Ispiši odabrane urone</translation>
+        <translation>Ispiši odabrane urone</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">Ispis u boji</translation>
+        <translation>Ispis u boji</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Vrsta ispisa</translation>
+        <translation>Vrsta ispisa</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 urona po stranici</translation>
+        <translation>6 urona po stranici</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 urona po stranici</translation>
+        <translation>2 urona po stranici</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Tablični ispis</translation>
+        <translation>Tablični ispis</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished">Redosljed</translation>
+        <translation>Redosljed</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Profil na vrhu</translation>
+        <translation>Profil na vrhu</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Bilješke na vrhu</translation>
+        <translation>Bilješke na vrhu</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3967,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Uredi</translation>
+        <translation>Uredi</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">zrak</translation>
+        <translation>zrak</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Neplanirani prelazak na OC sustav</translation>
+        <translation>Neplanirani prelazak na OC sustav</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> započni</translation>
+        <translation> započni</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> završi</translation>
+        <translation> završi</translation>
     </message>
 </context>
 <context>
@@ -4055,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">nepoznato</translation>
+        <translation>nepoznato</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Boca</translation>
+        <translation>Boca</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Mješavina</translation>
+        <translation>Mješavina</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished">Potrošeno plina</translation>
+        <translation>Potrošeno plina</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Max CNS</translation>
+        <translation>Max CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4118,50 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">Zrak</translation>
+        <translation>Zrak</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Zatvori</translation>
+        <translation>Zatvori</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Ø</translation>
+        <translation>Ø</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished">Min.</translation>
+        <translation>Min.</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished">Max.</translation>
+        <translation>Max.</translation>
     </message>
 </context>
 <context>
@@ -4169,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Renumeriraj</translation>
+        <translation>Renumeriraj</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Novi početni broj</translation>
+        <translation>Novi početni broj</translation>
     </message>
 </context>
 <context>
@@ -4182,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4210,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">O programu Subsurface</translation>
+        <translation>O programu Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4238,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Web servis</translation>
+        <translation>Web servis</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Greška u komunikaciji: </translation>
+        <translation>Greška u komunikaciji: </translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Neispravna korisnička oznaka</translation>
+        <translation>Neispravna korisnička oznaka</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Ne mogu obraditi odziv</translation>
+        <translation>Ne mogu obraditi odziv</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Preuzimanje uspješno!</translation>
+        <translation>Preuzimanje uspješno!</translation>
     </message>
 </context>
 <context>
@@ -4276,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>Bar</translation>
     </message>
 </context>
 <context>
@@ -4307,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -4328,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Lozinka</translation>
+        <translation>Lozinka</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4366,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Vrsta</translation>
+        <translation>Vrsta</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Težina</translation>
+        <translation>Težina</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4385,42 +2031,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">Br.</translation>
+        <translation>Br.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4428,7 +2074,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4436,19 +2082,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4456,64 +2102,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">Pa</translation>
+        <translation>Pa</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">cuft</translation>
+        <translation>cuft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) ili (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) ili (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4523,32 +2165,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">zrak</translation>
+        <translation>zrak</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">integrirani</translation>
+        <translation>integrirani</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">pojas</translation>
+        <translation>pojas</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">gležanj</translation>
+        <translation>gležanj</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">backplate olova</translation>
+        <translation>backplate olova</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">clip-on</translation>
+        <translation>clip-on</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4558,314 +2200,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Nije uspjelo čitanje &apos;%s&apos;</translation>
+        <translation>Nije uspjelo čitanje &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">nijedan</translation>
+        <translation>nijedan</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">deko zastoj</translation>
+        <translation>deko zastoj</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">rbt</translation>
+        <translation>rbt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">izron</translation>
+        <translation>izron</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">strop</translation>
+        <translation>strop</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">opterećenje</translation>
+        <translation>opterećenje</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">odašiljač</translation>
+        <translation>odašiljač</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">povreda</translation>
+        <translation>povreda</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">bookmark</translation>
+        <translation>bookmark</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">površina</translation>
+        <translation>površina</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">sigurnosna stanka</translation>
+        <translation>sigurnosna stanka</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">promjena plina</translation>
+        <translation>promjena plina</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">sigurnosna stanka (opcionalna)</translation>
+        <translation>sigurnosna stanka (opcionalna)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">sigurnosna stanka (obavezna)</translation>
+        <translation>sigurnosna stanka (obavezna)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">dubinska stanka</translation>
+        <translation>dubinska stanka</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">strop (sigurnosni zastoj)</translation>
+        <translation>strop (sigurnosni zastoj)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">trajanje urona</translation>
+        <translation>trajanje urona</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">Max dubina</translation>
+        <translation>Max dubina</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">OLF</translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">preostalo trajanje zraka</translation>
+        <translation>preostalo trajanje zraka</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">kurs</translation>
+        <translation>kurs</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">upozorenje tkivo</translation>
+        <translation>upozorenje tkivo</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">non stop vrijeme</translation>
+        <translation>non stop vrijeme</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">neispravan broj događaja</translation>
+        <translation>neispravan broj događaja</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Ne mogu kreirati parser za %s %s</translation>
+        <translation>Ne mogu kreirati parser za %s %s</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Greška pri registraciji podataka</translation>
+        <translation>Greška pri registraciji podataka</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Greška pri parsiranju datuma i vremena</translation>
+        <translation>Greška pri parsiranju datuma i vremena</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Uron #%d - %s %d %04d</translation>
+        <translation>Uron #%d - %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Greška pri parsiranju vremena urona</translation>
+        <translation>Greška pri parsiranju vremena urona</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Greška pri parsiranju maksimalne dubine</translation>
+        <translation>Greška pri parsiranju maksimalne dubine</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Greška pri parsiranju broja mješavina</translation>
+        <translation>Greška pri parsiranju broja mješavina</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Greška pri dohvaćanju saliniteta vode</translation>
+        <translation>Greška pri dohvaćanju saliniteta vode</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Greška pri parsiranju mješavine plinova</translation>
+        <translation>Greška pri parsiranju mješavine plinova</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Greška pri parsiranju uzoraka</translation>
+        <translation>Greška pri parsiranju uzoraka</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Događaj: čekanje na korisničku akciju</translation>
+        <translation>Događaj: čekanje na korisničku akciju</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
+        <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Greška pri registraciji event handlera.</translation>
+        <translation>Greška pri registraciji event handlera.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Greška pri registraciji cancellation handlera</translation>
+        <translation>Greška pri registraciji cancellation handlera</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Greška pri uvozu podataka</translation>
+        <translation>Greška pri uvozu podataka</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">Ne mogu kreirati libdivecomputer kontekst</translation>
+        <translation>Ne mogu kreirati libdivecomputer kontekst</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Nije uspjelo otvaranje %s %s (%s)</translation>
+        <translation>Nije uspjelo otvaranje %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Neobično očitanje postotka %s
+        <translation>Neobično očitanje postotka %s
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Nije uspjelo parsiranje &apos;%s&apos;.
+        <translation>Nije uspjelo parsiranje &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Nije uspjelo parsiranje &apos;%s&apos;</translation>
+        <translation>Nije uspjelo parsiranje &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished">Neuspjeo get_events na bazi.
+        <translation>Neuspjeo get_events na bazi.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished">Neuspjelo spajanje na bazu &apos;%s&apos;.
+        <translation>Neuspjelo spajanje na bazu &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished">Neuspjeo upit na bazu &apos;%s&apos;.
+        <translation>Neuspjeo upit na bazu &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">Ne mogu otvoriti stylesheet (%s)/%s</translation>
+        <translation>Ne mogu otvoriti stylesheet (%s)/%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Ne mogu naći plin %d/%d</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Boca za planiranje</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simulirani uron</translation>
+        <translation>Ne mogu naći plin %d/%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">Previše mješavina plinova</translation>
+        <translation>Previše mješavina plinova</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4874,7 +2508,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Subsurface plan urona
 temeljen na GFlow = %.0f i GFhigh = %.0f
 
@@ -4884,166 +2518,162 @@ temeljen na GFlow = %.0f i GFhigh = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Prelazak na %.*f %s u %d:%02d min - ukupno vrijeme %d:%02u na %s
+        <translation>Prelazak na %.*f %s u %d:%02d min - ukupno vrijeme %d:%02u na %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Stanka na %.*f %s u trajanju %d:%02d min - Ukupno vrijeme %d:%02u na %s
+        <translation>Stanka na %.*f %s u trajanju %d:%02d min - Ukupno vrijeme %d:%02u na %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Prebaci plin na %s
+        <translation>Prebaci plin na %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Potrošnja plina:
+        <translation>Potrošnja plina:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s %s
+        <translation>%.0f%s %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 D:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Izračunati strop %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Sigurnosni zastanak:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Sigurnosni zastoj:nepoz.vrijeme @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deko:nepoznato vrijeme @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 U deko</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
@@ -5052,7 +2682,7 @@ MOD:%d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 EAD:%d%s
 END:%d%s
 EADD:%d%s</translation>
@@ -5061,352 +2691,336 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">neispravan</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">brod</translation>
+        <translation>brod</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">obala</translation>
+        <translation>obala</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished">drift</translation>
+        <translation>drift</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">dubok</translation>
+        <translation>dubok</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">pećina</translation>
+        <translation>pećina</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">led</translation>
+        <translation>led</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">olupina</translation>
+        <translation>olupina</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">špilja</translation>
+        <translation>špilja</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">nadmorska visina</translation>
+        <translation>nadmorska visina</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">bazen</translation>
+        <translation>bazen</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">jezero</translation>
+        <translation>jezero</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">rijeka</translation>
+        <translation>rijeka</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">noć</translation>
+        <translation>noć</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">slatka voda</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">trening</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">poduka</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">fotografija</translation>
+        <translation>fotografija</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">video</translation>
+        <translation>video</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished"></translation>
+        <translation>deko</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">više od %d dana</translation>
+        <translation>više od %d dana</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dd %dh %dmin</translation>
+        <translation>%dd %dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dst %dmin</translation>
+        <translation>%dst %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">za urone #</translation>
+        <translation>za urone #</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">za odabrane urone</translation>
+        <translation>za odabrane urone</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">za uron #%d</translation>
+        <translation>za uron #%d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">za odabrani uron</translation>
+        <translation>za odabrani uron</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">za sve urone</translation>
+        <translation>za sve urone</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(nema urona)</translation>
+        <translation>(nema urona)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">Ned</translation>
+        <translation>Ned</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">Pon</translation>
+        <translation>Pon</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">Uto</translation>
+        <translation>Uto</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">Sri</translation>
+        <translation>Sri</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">Čet</translation>
+        <translation>Čet</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">Pet</translation>
+        <translation>Pet</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">Sub</translation>
+        <translation>Sub</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">Sij</translation>
+        <translation>Sij</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">Velj</translation>
+        <translation>Velj</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">Ožu</translation>
+        <translation>Ožu</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">Tra</translation>
+        <translation>Tra</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">Svi</translation>
+        <translation>Svi</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">Lip</translation>
+        <translation>Lip</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">Srp</translation>
+        <translation>Srp</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">Kol</translation>
+        <translation>Kol</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">Ruj</translation>
+        <translation>Ruj</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">Lis</translation>
+        <translation>Lis</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">Stu</translation>
+        <translation>Stu</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">Pro</translation>
+        <translation>Pro</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zurich: Datotečni sustav je skoro pun
+        <translation>Uemis Zurich: Datotečni sustav je skoro pun
 odspojite pa ponovo spojite ronilačko računalo
 i kliknite &apos;Retry&apos;</translation>
     </message>
@@ -5415,7 +3029,7 @@ i kliknite &apos;Retry&apos;</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zurich: Datotečni sustav je pun
+        <translation>Uemis Zurich: Datotečni sustav je pun
 Iskopčajte i ponovo ukopčajte ronilačko računalo
 i pokušajte ponovo.</translation>
     </message>
@@ -5423,193 +3037,193 @@ i pokušajte ponovo.</translation>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Greška pri pisanju u datoteku req.txt
+        <translation>Greška pri pisanju u datoteku req.txt
 Je li Uemis Zurich ispravno priključen?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">nepoznato</translation>
+        <translation>nepoznato</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Čitanje %s %s</translation>
+        <translation>Čitanje %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">podaci</translation>
+        <translation>podaci</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">ID unosa u dnevniku</translation>
+        <translation>ID unosa u dnevniku</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">divespot data id</translation>
+        <translation>divespot data id</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">više podataka za ID urona</translation>
+        <translation>više podataka za ID urona</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">mokro odijelo</translation>
+        <translation>mokro odijelo</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">polusuho</translation>
+        <translation>polusuho</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">suho odijelo</translation>
+        <translation>suho odijelo</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">shorty</translation>
+        <translation>shorty</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">jakna</translation>
+        <translation>jakna</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">long john</translation>
+        <translation>long john</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">kompenzator plovnosti</translation>
+        <translation>kompenzator plovnosti</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">puno odijelo</translation>
+        <translation>puno odijelo</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">dvodjelno odijelo</translation>
+        <translation>dvodjelno odijelo</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">membrana</translation>
+        <translation>membrana</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Uspostavljanje veze</translation>
+        <translation>Uspostavljanje veze</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Uemis greška pri inicijalizaciji</translation>
+        <translation>Uemis greška pri inicijalizaciji</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Započni preuzimanje</translation>
+        <translation>Započni preuzimanje</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Kršenje sigurnosne stanke</translation>
+        <translation>Kršenje sigurnosne stanke</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Alarm: Brzina</translation>
+        <translation>Alarm: Brzina</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Upozorenje: Brzina</translation>
+        <translation>Upozorenje: Brzina</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Upozorenje: PO2 Zeleno</translation>
+        <translation>Upozorenje: PO2 Zeleno</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Upozorenje: Prebrzi izron / PO2</translation>
+        <translation>Upozorenje: Prebrzi izron / PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Alarm: Prebrzi izron / PO2</translation>
+        <translation>Alarm: Prebrzi izron / PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Podaci od pritisku u boci</translation>
+        <translation>Podaci od pritisku u boci</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">RTG Upozorenje</translation>
+        <translation>RTG Upozorenje</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">RGT Alarm</translation>
+        <translation>RGT Alarm</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Preporučena izmjena boce</translation>
+        <translation>Preporučena izmjena boce</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Premašeno ograničenje dubine</translation>
+        <translation>Premašeno ograničenje dubine</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Upozorenje: Max. vrijeme dekompresije</translation>
+        <translation>Upozorenje: Max. vrijeme dekompresije</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Info: Trajanje urona</translation>
+        <translation>Info: Trajanje urona</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Alarm: Trajanje urona</translation>
+        <translation>Alarm: Trajanje urona</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Oznaka</translation>
+        <translation>Oznaka</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Nema podatka o boci</translation>
+        <translation>Nema podatka o boci</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Upozorenje: Baterija pri izmaku</translation>
+        <translation>Upozorenje: Baterija pri izmaku</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Alarm: Baterija pri izmaku</translation>
+        <translation>Alarm: Baterija pri izmaku</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts
index a810d2e41..c6e6891c2 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -1,2032 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="it_IT">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-Nessun evento
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete"> &gt; Mese</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete">Download</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete"> Selezionare il computer e la periferica</translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">inizio</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">fine</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">#</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s di %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s%2$s %4$d. %3$s %5$d   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d   %5$dh%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dt %dst %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dst %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s⏎ CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s⏎ Deco:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s⏎ Deco:tempo sconosciuto @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s⏎ In decompressione</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s⏎ MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s⏎ NDL:%umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-P:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s⏎ Sosta di sicurezza:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s⏎ Sosta di sicurezza:tempo sconosciuto @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s⏎ T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s⏎ pHe:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s⏎ pN%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s⏎ pO%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) oder (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(clicca per modificare la data/il tempo)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(clicca per modificare data/tempo/profondità)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(nessuna immersione)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(niente)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 cuft/min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 cuft/min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 l/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 immersioni per pagina</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">Muta intera 2 pezzi</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 l/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">incrementi di 3m per calcolare il ceiling</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 immersioni per pagina</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">ARIA</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">Informazioni su Subsurface</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Aggiungi Immersione...</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Aggiungi immersione</translation>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Aggiungi al viaggio sopra</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Aggiungi un punto intermedio</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Pressione aria</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Temperatura aria</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Temperatura aria in %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Preferisci sempre l&apos;immersione scaricata</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">Apr</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">Ago</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Raggruppa</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Media</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Media</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Media</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Media</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Profondità media</translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Profontità media (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">CAS Medio</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Temperatura Media</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Tempo Medio</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Bailing out in corcuito aperto</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">Bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Compagno</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CC SetPoint</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Non trovo il gas %d/%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">Non posso aprire il foglio di calcolo  (%s)/%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Cancellato, uscita in modo corretto...</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Cancellato...</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Non posso analizzare la risposta!</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Celsius</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Selezionare il file XML di default</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Selezionare i files XML da importare nel file dei dati</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Chiudi</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Minimizza tutto</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">In connessione...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Errore di connessione:</translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Crea un nuovo viaggio sopra</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">Piedi cubi</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Bombola</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Bombola</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Bombola per la pianificazione</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Bombole</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">DISCLAIMER / AVVISO: QUESTA È UNA NUOVA IMPLEMENTAZIONE DELL&apos;ALGORITMO DI BUHLMANN E DELL&apos;IMPLEMENTAZIONE DEL  PIANO DI IMMERSIONE BASATO SU CIÒ CHE HA TICEVUTO SOLO UNA LIMITATA QUANTITA DI TEST. E&apos; ALTAMENTE RACCOMANDATO DI NON PIANIFICARE IMMERSIONI BASATE SEMPLICEMENTE SUI RISULTATI DATI QUI.</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Data e Tempo</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Data:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">Dic</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">File XML di default</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Cancella le informazini del computer date qui</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Cancella immersione</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Cancella immersioni</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Profondità</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Limite Profondità Superato</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Profondità:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Nome periferica</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Periferica o punto di mount</translation>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Immersione #%d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Immersione #%d: %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Soprannome del computer</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Informazioni sull&apos;immersione</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Note dell&apos;immersione</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Piano d&apos;immersione - QUESTA E&apos; SOLO UNA SIMULAZIONE; NON USARE PER IMMERGERSI </translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Tempo d&apos;Immersione</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Allarme: Tempo d&apos;Immersione</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Info: Tempo d&apos;Immersione</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Marca e modello del computer subacqueo</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Errore importazione dati immersione</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Luoghi immersione</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Dive master</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">L&apos;immersione quando comincia ?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Immersione n.</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Carattere Immersione</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Divemaster</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Immersioni</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Posizione dell&apos;immersione</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Scarica dal Computer</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Scarica dal Computer...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Scarica da Web Service</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Scarica da Web Service...</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Donload effettuato!</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Durata</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Durata (min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">E</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Modifica</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Modifica il nome della periferica</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Modifica il soprannome del computer</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Modifica Informazioni Viaggio</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Modifica Riepilogo Viaggio</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Modifica il soprannome del computer con un doppio click nel campo del soprannome</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Modifica Immersione</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Modifica la data/il tempo di immersione</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Modifica Immersioni</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Modifica più immerisoni</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Modifica il riepilogo di viaggio</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Abilita / Disabilita Eventi</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Fine</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Profondità finale</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Inserire l&apos;identificativo dell&apos;utente e premere &apos;Download&apos;. Una volta che il download è completato puoi premere &apos;Applica&apos; se vuoi applicare le modifiche.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Attrezzatura</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Errore nell&apos;ottenimento della salinità dell&apos;acqua</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Errore analizzando la data/il tempo</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Errore analizzando il tempo di immersione</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Errore analizzando la miscela di gas</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Errore analizzando il conteggio della miscela di gas</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Errore analizzando la profondità massima</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Errore analizzando i campioni</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Errore registrando il gestore della cancellazione.</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Errore registrando la data</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Errore registrando il gestore degli eventi.</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Evento: systime=%&lt;PRId64&gt;, devtime=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Evento: in attesa dell&apos; azione dell&apos;utente.</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Espandi tutto</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Impossibile aprire i file %i</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Impossibile analizzare  &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Impossibile analizzare &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Impossibile leggere &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Impossibile leggere &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">Feb</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">Piedi</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">File</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filtro</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Forza il download di tutte le immersioni</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Ven</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFhigh</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFhigh del piano</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFlow</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFlow del piano</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (in formato WGS84 o GPS)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Gas Usato</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Gas Usato</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Gas Usato</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Consumo gas:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Miscela di gas</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Preferenze genrali</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Aiuto</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">Inattivo</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Informazioni</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Inizializzo la comunicazione</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Piano in ingresso</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Profondità invalida - impossibile analizzare &quot;%s&quot;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Profondità invalida - i valori più profondi di 400m non sono supportati </translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Gas non valido per la riga %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Tempo di partenza non valido</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Identificatore dell&apos;utente non valido!</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Gen</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">Lug</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">Giu</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel, e altri, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Lista</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">Litri</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Luogo</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Più lunga</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Immersione più lunga</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Allarme: Batteria scarica</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Avviso: Batteria Scarica</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Provider delle mappe</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Marca la posizione qui</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Marcatore</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Master</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Avviso: Massimo tempo di decompressione</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Profondità Massima</translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Profondità massima  (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">CAS Massimo</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Temperatura Massima</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Profontià massima: %.*f %s
-Durata: %d min
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">CNS massimo</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Pressione Massima</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Massimo</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Massimo</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Massimo</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">Mag</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Unisci immersioni</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Raggruppa il viaggio con il viaggio sopra</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Raggruppa il viaggio con il viaggio sotto</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">Metro</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Profondità Minima</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Min. CAS</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Temperatura Minima</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Minimo</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Minimo</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Minimo</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Opzioni</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Modello</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lun</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Programma Multi-piattaforma in C per il log delle immersioni</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nuovo</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Nuovo numero di inizio</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">DC successivo</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Nickname</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Nessun dato sulla bombola</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Note</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">Nov</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">Ott</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Errore di ditorno del pthread dispari</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Ok per cancellare le voci selezionate?</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Apri File</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Apri...</translation>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Ossigeno</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Allarme Incremento PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Avviso Incremento PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Avviso PO2 Verde</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">PSI</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Segliere sulla mappa</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Pianificatore</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Preferenze</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Preferenze...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Pressione</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Pressione:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">DC precedente</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Stampa solo le immersioni selezionate</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Stampa selezione</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Stampa tipo</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Stampa...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Profilo</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Impostazioni profilo</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Esci</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Allarme RGT</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Avviso RGT</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Valutazione</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Sto leggendo %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Rimuovi Viaggio</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Rimuovi immersione dal viaggio</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Rimuovi le immersioni selezionate dal viaggio</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Rinumera</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Rinumera...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Riprova</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">CAS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">CAS durante la sosta di deco</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">CAS durante l&apos;immersione</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Violazione della tappa di sicurezza</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sab</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Salva Come...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Salvare le modifiche?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Salvare il File come</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Salva come</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Salva...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Segmento di tempo</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Seleziona eventi</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Seleziona eventi...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">Set</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Scrittura breve sul file req.txt
-Lo Uemis Zurich e&apos; collegato correttamente?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Più corto</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Immersione più corta</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Visualizza Colonne</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">Visualizza EAD, END, EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">Visualizza MOD</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Mostra il ceiling calcolato</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Mostra in rosso il DC segnalato dal  ceiling</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Visualizza nella mappa</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">Visualizza la pHe nel il grafo</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">Visualizza la pN%s nel grafo</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">Visualizza la pO%s  nel grafo</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Immersione simulata</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Dimensione</translation>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Allarme Risalita Veloce</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Avviso Risalita Veloce</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Inizio</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Inizio download</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Statistiche</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Statistiche %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Statistiche</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Stato</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Fermati a %.*f %s per %d:%02d min - tempo trascorso %d:%02u su %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Lettura di strane percentuali %s
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Muta</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Intervallo di Superficie</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Pressione di superfice (mbar)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Cambiare gas a %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Stampa Tabella</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Suggerito Cambio Bombola</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Informazione Pressione della bombola</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Impostazioni tec</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Temperatura</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Temperatura</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Temperatura:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Albero</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Gio</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Tempo</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Per modificare le informazioni dell&apos;immersione
-doppio click nella lista immersioni</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zoom Alternativo</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">Troppe miscele gas</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">Troppi punti di riferimento</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Totale</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Tempo Totale</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Peso totale:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Viaggio %1$s, %3$d. %2$s %4$d (%5$d Immersione)</numerusform>
-            <numerusform>Viaggio %1$s, %3$d. %2$s %4$d (%5$d Immersioni)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Tipo</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zurich: Il File System è quasi pieno
-Disconnettere/riconnettere il computer subacqueo
-e cliccare &quot;Riprova&quot;</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zurich: File System pieno
-Disconnettere/connettere il computer
-e riprovare</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Impossibile inizializzare l&apos;Uemis</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Impossibile creare un parser per %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Impossibile aprire %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Unità</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Usare il pulsante destro per marcare un sito d&apos;Immersione</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Identificatore utente</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Manuale Utente</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Visualizza</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Visibilità</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Volume:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">W</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Avviso - immersioni estremamente lunghe possono causare un lungo tempo di elaborazione</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Avviso - pianificare immersioni molto profonde può impiegare un tempo eccessiso</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Temperatura dell&apos;acqua</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Webservice</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mer</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Peso</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Sistema di Zavorra</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Peso:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">File XML</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Anno</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Statistiche Annuali</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">Già possiedi un computer subacqueo di questo modello⏎ chiamato %s⏎ Subsurface può mantenere il soprannome di questa periferica per distinguerla da quella esistente. Il modello di default e l&apos;ID della periferica sono mostrati sotto.⏎ Se non vuoi dare un nome a questo computer subacqueo clicca &apos;Cancella&apos; e Subsurface mostrerà semplicemente il suo modello e il suo nome (il che può significare che non si può distinguere i due computer subacquei a parte che nei logs) </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Non hai salvato le modifiche.
-Vuoi salvare prima di chiudere il file dei dati?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Non hai salvato le modifiche al file %s.
-Vuoi salvare prima di chiudere il file dei dati?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">aria</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">tempo in aria</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">caviglia</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">risalita</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">peso della piastra</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">cintura</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">segnalibro</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">ceiling</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">ceiling (sosta di sicurezza)</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">clip-on</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">piedi cubi</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">data</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">deco stop</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">deepstop</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">id del log d&apos;immersione</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">durata immersione</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">Muta stagna</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">per tutte le immersioni</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">per l&apos;immersione #%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">per l&apos;immersione #</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">per l&apos;immersione selezionata</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">per le immersioni selezionate</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">ft</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">muta intera</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">cambio gas</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">intestazione</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">integrato</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">numero evento non valido</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">GAV</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">lbs</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">long john</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">max ppO2</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">max CNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">profondità massima</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">membrana</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">min</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">modello=%u (0x%08x), firmware=%u (0x%08x), numero di serie=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">più di %d giorni</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">tempo di non stop</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">nessuno</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">limite pHe</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">limite pN%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">limite pO%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">pascal</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">sosta di sicurezza</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">sosta di sicurezza (obbligatoria)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">sosta di sicurezza (facoltativa)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">semi stagna</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">shorty</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">superficie</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">avviso del livello dei tessuti</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">Filippo Moser</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">trasmettitore</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">sconosciuto</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">sconosciuto</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">non specificato</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">maglia</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">violazione</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">peso</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">muta umida</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">carico di lavoro</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Tempo</translation>
+        <translation>Ora</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Profondità</translation>
+        <translation>Profondità</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Temperatura</translation>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2034,57 +77,57 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Tipo</translation>
+        <translation>Tipo</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Dimensione</translation>
+        <translation>Dimensione</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2092,41 +135,41 @@ tranlators here
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Modifica il soprannome del computer</translation>
+        <translation>Modifica il soprannome del computer</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Modello</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Modello</translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Nickname</translation>
+        <translation>Nickname</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2134,12 +177,12 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2147,95 +190,87 @@ tranlators here
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Raggruppa il viaggio con il viaggio sopra</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Raggruppa il viaggio con il viaggio sotto</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2243,48 +278,48 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2292,23 +327,23 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2316,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">ARIA</translation>
+        <translation>ARIA</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Durata</translation>
+        <translation>Durata</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2354,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2372,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">min</translation>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Muta</translation>
+        <translation>Muta</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Bombola</translation>
+        <translation>Bombola</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">CAS</translation>
+        <translation>CAS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">max CNS</translation>
+        <translation>max CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Luogo</translation>
+        <translation>Luogo</translation>
     </message>
 </context>
 <context>
@@ -2441,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Riprova</translation>
+        <translation>Riprova</translation>
     </message>
 </context>
 <context>
@@ -2459,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Scarica dal Computer</translation>
+        <translation>Scarica dal Computer</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Forza il download di tutte le immersioni</translation>
+        <translation>Forza il download di tutte le immersioni</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2507,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Note dell&apos;immersione</translation>
+        <translation>Note dell&apos;immersione</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Luogo</translation>
+        <translation>Luogo</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Divemaster</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Compagno</translation>
+        <translation>Compagno</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Valutazione</translation>
+        <translation>Valutazione</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Visibilità</translation>
+        <translation>Visibilità</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Muta</translation>
+        <translation>Muta</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Note</translation>
+        <translation>Note</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Attrezzatura</translation>
+        <translation>Attrezzatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Informazioni sull&apos;immersione</translation>
+        <translation>Informazioni sull&apos;immersione</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">CAS</translation>
+        <translation>CAS</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Tempo d&apos;Immersione</translation>
+        <translation>Tempo d&apos;Immersione</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Statistiche</translation>
+        <translation>Statistiche</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Profondità</translation>
+        <translation>Profondità</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatura</translation>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Durata</translation>
+        <translation>Durata</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Tempo Totale</translation>
+        <translation>Tempo Totale</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Immersioni</translation>
+        <translation>Immersioni</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Bombole</translation>
+        <translation>Bombole</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -2734,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">sconosciuto</translation>
+        <translation>sconosciuto</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">E</translation>
+        <translation>E</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">W</translation>
+        <translation>W</translation>
     </message>
 </context>
 <context>
@@ -2767,417 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">File</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Visualizza</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filtro</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Aiuto</translation>
+        <translation>Filtro</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Nuovo</translation>
+        <translation>Nuovo</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Salva come</translation>
+        <translation>Salva come</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Chiudi</translation>
+        <translation>Chiudi</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Profilo</translation>
+        <translation>Profilo</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Informazioni</translation>
+        <translation>Informazioni</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Preferenze</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Esci</translation>
+        <translation>Preferenze</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Modifica il nome della periferica</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Rinumera</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zoom Alternativo</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Statistiche Annuali</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">DC precedente</translation>
+        <translation>DC precedente</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">DC successivo</translation>
+        <translation>DC successivo</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Seleziona eventi</translation>
+        <translation>Seleziona eventi</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Piano in ingresso</translation>
+        <translation>Piano in ingresso</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Informazioni su Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Manuale Utente</translation>
+        <translation>Informazioni su Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Apri File</translation>
+        <translation>Apri File</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Salvare le modifiche?</translation>
+        <translation>Salvare le modifiche?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3187,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3205,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Unità</translation>
+        <translation>Unità</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Immersioni</translation>
+        <translation>Immersioni</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Profondità</translation>
+        <translation>Profondità</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">Metro</translation>
+        <translation>Metro</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">Piedi</translation>
+        <translation>Piedi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Pressione</translation>
+        <translation>Pressione</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <translation>Bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">Litri</translation>
+        <translation>Litri</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">Piedi cubi</translation>
+        <translation>Piedi cubi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatura</translation>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Celsius</translation>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Fahrenheit</translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Peso</translation>
+        <translation>Peso</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3495,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3503,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Immersione n.</translation>
+        <translation>Immersione n.</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Profondità</translation>
+        <translation>Profondità</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Durata</translation>
+        <translation>Durata</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Master</translation>
+        <translation>Master</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Compagno</translation>
+        <translation>Compagno</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Luogo</translation>
+        <translation>Luogo</translation>
     </message>
 </context>
 <context>
@@ -3541,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Stampa solo le immersioni selezionate</translation>
+        <translation>Stampa solo le immersioni selezionate</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished"></translation>
+        <translation>Stampa a colori</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Stampa tipo</translation>
+        <translation>Stampa tipo</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 immersioni per pagina</translation>
+        <translation>6 immersioni per pagina</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 immersioni per pagina</translation>
+        <translation>2 immersioni per pagina</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Stampa Tabella</translation>
+        <translation>Stampa Tabella</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordinamento</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilo in primo piano</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished"></translation>
+        <translation>Note in primo piano</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3626,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Modifica</translation>
+        <translation>Modifica</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">aria</translation>
+        <translation>aria</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Bailing out in corcuito aperto</translation>
+        <translation>Bailing out in corcuito aperto</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">inizio</translation>
+        <translation>inizio</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">fine</translation>
+        <translation>fine</translation>
     </message>
 </context>
 <context>
@@ -3714,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">sconosciuto</translation>
+        <translation>sconosciuto</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Bombola</translation>
+        <translation>Bombola</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Miscela di gas</translation>
+        <translation>Miscela di gas</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished">Gas Usato</translation>
+        <translation>Gas Usato</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">CAS</translation>
+        <translation>CAS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">CNS massimo</translation>
+        <translation>CNS massimo</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3777,50 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">ARIA</translation>
+        <translation>ARIA</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Chiudi</translation>
+        <translation>Chiudi</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Media</translation>
+        <translation>Media</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished">Minimo</translation>
+        <translation>Minimo</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished">Massimo</translation>
+        <translation>Massimo</translation>
     </message>
 </context>
 <context>
@@ -3828,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Rinumera</translation>
+        <translation>Rinumera</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Nuovo numero di inizio</translation>
+        <translation>Nuovo numero di inizio</translation>
     </message>
 </context>
 <context>
@@ -3841,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3869,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Informazioni su Subsurface</translation>
+        <translation>Informazioni su Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3897,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Webservice</translation>
+        <translation>Webservice</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Errore di connessione:</translation>
+        <translation>Errore di connessione:</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Identificatore dell&apos;utente non valido!</translation>
+        <translation>Identificatore dell&apos;utente non valido!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Non posso analizzare la risposta!</translation>
+        <translation>Non posso analizzare la risposta!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Donload effettuato!</translation>
+        <translation>Download effettuato!</translation>
     </message>
 </context>
 <context>
@@ -3935,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>Bar</translation>
     </message>
 </context>
 <context>
@@ -3966,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -3987,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation>ID utente</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Password</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4025,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Tipo</translation>
+        <translation>Tipo</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Peso</translation>
+        <translation>Peso</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4044,42 +2031,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4087,7 +2074,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4095,19 +2082,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4115,64 +2102,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">pascal</translation>
+        <translation>pascal</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">piedi cubi</translation>
+        <translation>piedi cubi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) oder (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) oder (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4182,32 +2165,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">aria</translation>
+        <translation>aria</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">integrato</translation>
+        <translation>integrato</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">cintura</translation>
+        <translation>cintura</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">caviglia</translation>
+        <translation>caviglia</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">peso della piastra</translation>
+        <translation>peso della piastra</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">clip-on</translation>
+        <translation>clip-on</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4217,312 +2200,307 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Impossibile leggere &apos;%s&apos;</translation>
+        <translation>Impossibile leggere &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">nessuno</translation>
+        <translation>nessuno</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">deco stop</translation>
+        <translation>deco stop</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished"></translation>
+        <translation>rbt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">risalita</translation>
+        <translation>risalita</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">ceiling</translation>
+        <translation>ceiling</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">carico di lavoro</translation>
+        <translation>carico di lavoro</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">trasmettitore</translation>
+        <translation>trasmettitore</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">violazione</translation>
+        <translation>violazione</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">segnalibro</translation>
+        <translation>segnalibro</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">superficie</translation>
+        <translation>superficie</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">sosta di sicurezza</translation>
+        <translation>sosta di sicurezza</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">cambio gas</translation>
+        <translation>cambio gas</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">sosta di sicurezza (facoltativa)</translation>
+        <translation>sosta di sicurezza (facoltativa)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">sosta di sicurezza (obbligatoria)</translation>
+        <translation>sosta di sicurezza (obbligatoria)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">deepstop</translation>
+        <translation>deepstop</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">ceiling (sosta di sicurezza)</translation>
+        <translation>ceiling (sosta di sicurezza)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">durata immersione</translation>
+        <translation>durata immersione</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">profondità massima</translation>
+        <translation>profondità massima</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished"></translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">tempo in aria</translation>
+        <translation>tempo in aria</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">intestazione</translation>
+        <translation>intestazione</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">avviso del livello dei tessuti</translation>
+        <translation>avviso del livello dei tessuti</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">tempo di non stop</translation>
+        <translation>tempo di non stop</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">numero evento non valido</translation>
+        <translation>numero evento non valido</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Impossibile creare un parser per %s %s</translation>
+        <translation>Impossibile creare un parser per %s %s</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Errore registrando la data</translation>
+        <translation>Errore registrando la data</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Errore analizzando la data/il tempo</translation>
+        <translation>Errore analizzando la data/il tempo</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Immersione #%d: %s %d %04d</translation>
+        <translation>Immersione #%d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Errore analizzando il tempo di immersione</translation>
+        <translation>Errore analizzando il tempo di immersione</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Errore analizzando la profondità massima</translation>
+        <translation>Errore analizzando la profondità massima</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Errore analizzando il conteggio della miscela di gas</translation>
+        <translation>Errore analizzando il conteggio della miscela di gas</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Errore nell&apos;ottenimento della salinità dell&apos;acqua</translation>
+        <translation>Errore nell&apos;ottenimento della salinità dell&apos;acqua</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Errore analizzando la miscela di gas</translation>
+        <translation>Errore analizzando la miscela di gas</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Errore analizzando i campioni</translation>
+        <translation>Errore analizzando i campioni</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Evento: in attesa dell&apos; azione dell&apos;utente.</translation>
+        <translation>Evento: in attesa dell&apos; azione dell&apos;utente.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">modello=%u (0x%08x), firmware=%u (0x%08x), numero di serie=%u (0x%08x)</translation>
+        <translation>modello=%u (0x%08x), firmware=%u (0x%08x), numero di serie=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Errore registrando il gestore degli eventi.</translation>
+        <translation>Errore registrando il gestore degli eventi.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Errore registrando il gestore della cancellazione.</translation>
+        <translation>Errore registrando il gestore della cancellazione.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Errore importazione dati immersione</translation>
+        <translation>Errore importazione dati immersione</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile creare un contesto libdivecomputer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Impossibile aprire %s %s (%s)</translation>
+        <translation>Impossibile aprire %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Lettura di strane percentuali %s
+        <translation>Lettura di strane percentuali %s
 
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Impossibile analizzare &apos;%s&apos;.
+        <translation>Impossibile analizzare &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Impossibile analizzare  &apos;%s&apos;</translation>
+        <translation>Impossibile analizzare  &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Interrogazione get_events fallita.
+</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione al database fallita &apos;%s&apos;.
+</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Interrogazione al database fallita &apos;%s&apos;.
+</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">Non posso aprire il foglio di calcolo  (%s)/%s</translation>
+        <translation>Non posso aprire il foglio di calcolo  (%s)/%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Non trovo il gas %d/%d</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Bombola per la pianificazione</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Immersione simulata</translation>
+        <translation>Non trovo il gas %d/%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">Troppe miscele gas</translation>
+        <translation>Troppe miscele gas</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4531,159 +2509,161 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Piano d&apos;immersione di Subsurface 
+basato su GFlow = %.0f e GFhigh = %.0f
+
+</translation>
     </message>
     <message>
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Transizione a %.*f %s in %d:%02d min - tempo %d:%02u su %s
+</translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Fermati a %.*f %s per %d:%02d min - tempo trascorso %d:%02u su %s
+        <translation>Fermati a %.*f %s per %d:%02d min - tempo trascorso %d:%02u su %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Cambiare gas a %s
+        <translation>Cambiare gas a %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Consumo gas:
+        <translation>Consumo gas:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s di %s
+        <translation>%.0f%s di %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 P:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s⏎ T:%.1f %s</translation>
+        <translation>%s⏎ T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Calcolo ceiling %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s⏎ Sosta di sicurezza:%umin @ %.0f %s</translation>
+        <translation>%s⏎ Sosta di sicurezza:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s⏎ Sosta di sicurezza:tempo sconosciuto @ %.0f %s</translation>
+        <translation>%s⏎ Sosta di sicurezza:tempo sconosciuto @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s⏎ Deco:%umin @ %.0f %s</translation>
+        <translation>%s⏎ Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s⏎ Deco:tempo sconosciuto @ %.0f %s</translation>
+        <translation>%s⏎ Deco:tempo sconosciuto @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s⏎ In decompressione</translation>
+        <translation>%s⏎ In decompressione</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s⏎ NDL:%umin</translation>
+        <translation>%s⏎ NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s⏎ CNS:%u%%</translation>
+        <translation>%s⏎ CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s⏎ pO%s:%.2fbar</translation>
+        <translation>%s⏎ pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s⏎ pN%s:%.2fbar</translation>
+        <translation>%s⏎ pN%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s⏎ pHe:%.2fbar</translation>
+        <translation>%s⏎ pHe:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s⏎ MOD:%d%s</translation>
+        <translation>%s⏎ MOD:%d%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
@@ -4691,7 +2671,7 @@ MOD:%d%s</source>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 EAD:%d%s
 END:%d%s
 EADD:%d%s</translation>
@@ -4700,336 +2680,336 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished"></translation>
+        <translation>barca</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished"></translation>
+        <translation>riva</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished"></translation>
+        <translation>in corrente</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished"></translation>
+        <translation>profondo</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished"></translation>
+        <translation>caverna</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished"></translation>
+        <translation>ghiaccio</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished"></translation>
+        <translation>relitto</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished"></translation>
+        <translation>grotta</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished"></translation>
+        <translation>altitudine</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished"></translation>
+        <translation>piscina</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished"></translation>
+        <translation>lago</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished"></translation>
+        <translation>fiume</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished"></translation>
+        <translation>notte</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished"></translation>
+        <translation>foto</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished"></translation>
+        <translation>video</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished"></translation>
+        <translation>deco</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">più di %d giorni</translation>
+        <translation>più di %d giorni</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dt %dst %dmin</translation>
+        <translation>%dt %dst %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dst %dmin</translation>
+        <translation>%dst %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">per l&apos;immersione #</translation>
+        <translation>per l&apos;immersione #</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">per le immersioni selezionate</translation>
+        <translation>per le immersioni selezionate</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">per l&apos;immersione #%d</translation>
+        <translation>per l&apos;immersione #%d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">per l&apos;immersione selezionata</translation>
+        <translation>per l&apos;immersione selezionata</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">per tutte le immersioni</translation>
+        <translation>per tutte le immersioni</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(nessuna immersione)</translation>
+        <translation>(nessuna immersione)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">Dom</translation>
+        <translation>Dom</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">Lun</translation>
+        <translation>Lun</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">Mar</translation>
+        <translation>Mar</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">Mer</translation>
+        <translation>Mer</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">Gio</translation>
+        <translation>Gio</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">Ven</translation>
+        <translation>Ven</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">Sab</translation>
+        <translation>Sab</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">Gen</translation>
+        <translation>Gen</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">Feb</translation>
+        <translation>Feb</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">Mar</translation>
+        <translation>Mar</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">Apr</translation>
+        <translation>Apr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">Mag</translation>
+        <translation>Mag</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">Giu</translation>
+        <translation>Giu</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">Lug</translation>
+        <translation>Lug</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">Ago</translation>
+        <translation>Ago</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">Set</translation>
+        <translation>Set</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">Ott</translation>
+        <translation>Ott</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">Nov</translation>
+        <translation>Nov</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">Dic</translation>
+        <translation>Dic</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zurich: Il File System è quasi pieno
+        <translation>Uemis Zurich: Il File System è quasi pieno
 Disconnettere/riconnettere il computer subacqueo
 e cliccare &quot;Riprova&quot;</translation>
     </message>
@@ -5038,7 +3018,7 @@ e cliccare &quot;Riprova&quot;</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zurich: File System pieno
+        <translation>Uemis Zurich: File System pieno
 Disconnettere/connettere il computer
 e riprovare</translation>
     </message>
@@ -5046,193 +3026,193 @@ e riprovare</translation>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Scrittura breve sul file req.txt
+        <translation>Scrittura breve sul file req.txt
 Lo Uemis Zurich e&apos; collegato correttamente?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">sconosciuto</translation>
+        <translation>sconosciuto</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Sto leggendo %s %s</translation>
+        <translation>Sto leggendo %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">data</translation>
+        <translation>data</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">id del log d&apos;immersione</translation>
+        <translation>id del log d&apos;immersione</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished"></translation>
+        <translation>data id di divespot</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished"></translation>
+        <translation>più id di dati d&apos;immersione</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">muta umida</translation>
+        <translation>muta umida</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">semi stagna</translation>
+        <translation>semi stagna</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">Muta stagna</translation>
+        <translation>Muta stagna</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">shorty</translation>
+        <translation>shorty</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">maglia</translation>
+        <translation>maglia</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">long john</translation>
+        <translation>long john</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">GAV</translation>
+        <translation>GAV</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">muta intera</translation>
+        <translation>muta intera</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">Muta intera 2 pezzi</translation>
+        <translation>Muta intera 2 pezzi</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">membrana</translation>
+        <translation>membrana</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Inizializzo la comunicazione</translation>
+        <translation>Inizializzo la comunicazione</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Impossibile inizializzare l&apos;Uemis</translation>
+        <translation>Impossibile inizializzare l&apos;Uemis</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Inizio download</translation>
+        <translation>Inizio download</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Violazione della tappa di sicurezza</translation>
+        <translation>Violazione della tappa di sicurezza</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Allarme Risalita Veloce</translation>
+        <translation>Allarme Risalita Veloce</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Avviso Risalita Veloce</translation>
+        <translation>Avviso Risalita Veloce</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Avviso PO2 Verde</translation>
+        <translation>Avviso PO2 Verde</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Avviso Incremento PO2</translation>
+        <translation>Avviso Incremento PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Allarme Incremento PO2</translation>
+        <translation>Allarme Incremento PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Informazione Pressione della bombola</translation>
+        <translation>Informazione Pressione della bombola</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Avviso RGT</translation>
+        <translation>Avviso RGT</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Allarme RGT</translation>
+        <translation>Allarme RGT</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Suggerito Cambio Bombola</translation>
+        <translation>Suggerito Cambio Bombola</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Limite Profondità Superato</translation>
+        <translation>Limite Profondità Superato</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Avviso: Massimo tempo di decompressione</translation>
+        <translation>Avviso: Massimo tempo di decompressione</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Info: Tempo d&apos;Immersione</translation>
+        <translation>Info: Tempo d&apos;Immersione</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Allarme: Tempo d&apos;Immersione</translation>
+        <translation>Allarme: Tempo d&apos;Immersione</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Marcatore</translation>
+        <translation>Marcatore</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Nessun dato sulla bombola</translation>
+        <translation>Nessun dato sulla bombola</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Avviso: Batteria Scarica</translation>
+        <translation>Avviso: Batteria Scarica</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Allarme: Batteria scarica</translation>
+        <translation>Allarme: Batteria scarica</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index f2f39ac4d..cae455806 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -1,2388 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="nb_NO">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-Ingen hendelser
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete"> &gt; Måned</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete">Last ned</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete"> Velg dykkecomputer og enhet</translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> start</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> slutt</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">#</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s av %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s%2$s, %4$d. %3$s %5$d   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s. %3$d. %2$s %4$d  %5$dh%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s. %3$d. %2$s %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s. %3$d. %2$s %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dt %dt %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dt %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-Kalkulert tak %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deko:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deko:ukjent tid @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-I deko</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL:%umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-P:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Sikkerhetsstopp:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Sikkerhetsstopp: ukjent tid @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Subsurface dykkeplan
-basert på GFlow = %.0f og GFhigh = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s event at %d:%02u</source>
-        <translation type="obsolete">%s kl %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s: Response from divelogs.de</source>
-        <translation type="obsolete">%s: Resultat fra divelogs.de</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) eller (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(klikk for å redigere dato/tid)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(klikk for å redigere dato/tid/dybde)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(ingen dykk)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(ingenting)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 ft³/min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 ft³/min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 l/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 dykk per side</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">todelt drakt</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 l/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">3m intervaller for kalkulert tak</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 dykk per side</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;Add segments below.
-Each line describes part of the planned dive.
-An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. &apos;+3:30&apos;) or ends at the given time (if absolute e.g &apos;@5:00&apos;, &apos;runtime&apos;), and uses the given gas.
-An empty gas means &apos;use previous gas&apos; (or AIR if no gas was specified).
-An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.
-CC SetPoint specifies CC (rebreather) dives, leave empty for OC.&lt;/small&gt;
-</source>
-        <translation type="obsolete">&lt;small&gt;Legg til segmenter.
-Hver rad beskriver en del av det planlagte dykket.
-En rad med dybde, tid og gass beskriver et segment som slutter på den gitte dybden, tar den gitte tiden (hvis relativ tid er brukt, som &apos;+3:30&apos;) eller slutter på den gitte tiden (hvis absolutt tid er brukt, som &apos;@5:00&apos;), og bruker den angitte gassen.
-Et tomt gassfelt betyr &apos;bruk forrige gass&apos; (eller luft hvis det ikke var noen tidligere gass). En rad som har dybde og gass, men ikke tid er spesiell: planleggeren vet da at gassen er tilgjengelig når den oppgitte dybden nåes.
-CC setpoint spesifiserer rebreather-dykk, ikke bruk ved åpent system (OC).&lt;/small&gt;
-</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">Luft</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">Om Subsurface</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Legg til</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Nytt dykk...</translation>
-    </message>
-    <message>
-        <source>Add bookmark event here</source>
-        <translation type="obsolete">Legg til bokmerke her</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Nytt dykk</translation>
-    </message>
-    <message>
-        <source>Add gas change event here</source>
-        <translation type="obsolete">Legg til gassbytte her</translation>
-    </message>
-    <message>
-        <source>Add gaschange event at %d:%02u</source>
-        <translation type="obsolete">Legg til gassbytte ved %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Legg til i turen over</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Legg til rad</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Lufttrykk</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Lufttemp.</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Lufttemp i %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Foretrekk alltid nedlastet dykk</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">apr</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">aug</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Grupper automatisk</translation>
-    </message>
-    <message>
-        <source>Available gases</source>
-        <translation type="obsolete">Tilgjengelige gasser</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Gjennomsnitt</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Gjennomsnitt</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Gjennomsnitt</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Gjennomsnitt</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Snittdybde</translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Snittdybde (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">Snitt-SAC</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Snitt-temp.</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Snitt-tid</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Bytter til OC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Buddy</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CC setpoint</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Finner ikke gassen %d/%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">Kan ikke åpne stilark (%s)/%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Avbrutt, går ut...</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Avbrutt...</translation>
-    </message>
-    <message>
-        <source>Cannot add gas change</source>
-        <translation type="obsolete">Kunne ikke legge til gassbytte</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Kan ikke lese svar!</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">celsius</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Velg standard XML-fil</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Velg hvilke XML-filer du vil importere</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Lukk</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Fold sammen turer</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Kobler til...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Feil med forbindelse</translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Lag ny tur</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">ft³</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Flaske</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Flaske</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Tank fra plan</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Flasker</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">Advarsel! Dette er en ny implementasjon av Bühlmann-algoritmen, og en dykkeplanlegger som ikke har blitt testet noe særlig.  Vi anbefaler på det sterkeste å ikke planlegge dykk utelukkende med data herfra.</translation>
-    </message>
-    <message>
-        <source>Database connection failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Databaseforbindelse feiled &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Databasespørring feilen &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query get_events failed.
-</source>
-        <translation type="obsolete">Databasespørring get_eventes feilet.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Dato</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Dato og tid</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Dato:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">des</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">Standard XML-fil</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Slett informasjon om dykkecomputer</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Slett dykk</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Slett dykk</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Dybde</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Maksgrense for dybde overskredet</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Dybde:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Enhets-ID</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Enhet eller disk</translation>
-    </message>
-    <message>
-        <source>Display invalid dives</source>
-        <translation type="obsolete">Vis ugyldige dykk</translation>
-    </message>
-    <message>
-        <source>Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</source>
-        <extracomment>++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-&lt;trailing text&gt;
-</extracomment>
-        <translation type="obsolete">Dykk #%1$d - %2$s %4$02d. %3$02d %5$04d %6$d:%7$02d %8$s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Dykk #%d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Dykk #%d: %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Navn på dykkecomputer</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Informasjon</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Dykk</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Dykkeplan - DETTE ER KUN EN SIMULERING, IKKE BRUK TIL DYKKING</translation>
-    </message>
-    <message>
-        <source>Dive Tags</source>
-        <translation type="obsolete">Emneord</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Starttid</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Alarm: dykketid</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Info: dykketid</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Dykkecomputerleverandør og -modell</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Feil ved import av dykkedata</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Dykkesteder</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Dykkeleder</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Når starter dykket?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Dykk nr.</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Skrifttype for liste</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Dykkeleder</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Dykk</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Dykkesteder</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Last ned fra dykkecomputer</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Last ned fra dykkecomputer...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Last ned fra nettjeneste</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Last ned fra nettsted…</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Ferdig å laste ned</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Varighet</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Varighet (min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">Ø</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Rediger</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Rediger enhetsnavn</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Rediger navn for dykkecomputer</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Rediger turinformasjon</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Rediger tursammendrag</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Rediger navn for dykkecomputer ved å dobbeltklikke på det</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Rediger dykk</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Rediger dato og tid</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Rediger dykk</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Rediger flere dykk</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Rediger tursammendrag</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Skru på/av hendelser</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Tags</source>
-        <translation type="obsolete">Vis / skjul emneord</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Slutt</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Sluttdybde</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Skriv inn brukeridentifikator og trykk &apos;Last ned&apos;. Trykk &apos;Bruk&apos; når nedlastinga er ferdig hvis du vil lagre endringene.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Utstyr</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Feil</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Feil ved lesing av salthetsgrad</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Feil ved lesing av dato</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Feil ved lesing av dykketid</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Feil ved lesing av gassmiks</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Feil ved lesing av gassmiksantall</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Feil ved lesing av maksdybde</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Feil ved lesing av detaljer</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Feil ved registrering av avbruddshåndterer.</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Feil ved registrering av data</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Feil ved registrering av hendelseshåndterer.</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Hendelse: systime%&lt;PRId64&gt;, devtime=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Hendelse: Venter på bruker</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Fold ut turer</translation>
-    </message>
-    <message>
-        <source>Export As UDDF File</source>
-        <translation type="obsolete">Eksporter som UDDF</translation>
-    </message>
-    <message>
-        <source>Export UDDF...</source>
-        <translation type="obsolete">Eksporter UDDF...</translation>
-    </message>
-    <message>
-        <source>Export dive(s) to UDDF</source>
-        <translation type="obsolete">Eksporter dykk til UDDF</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Fikk ikke åpnet %i filer.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Kunne ikke lese &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Kunne ikke lese &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Kunne ikke åpne &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Kunne ikke åpne &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">feb</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">fot</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Fil</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filter</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Tvungen nedlasting av alle dykk</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">fre</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFhigh</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFhigh for plan</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFlow</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFlow for plan</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (WGS84- eller GPS-format)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Gass brukt</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Gassforbruk</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Gass</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Gasskonsum:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Gassmiks</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Generelle innstillinger</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Hjelp</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">Inaktiv</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Importer fil(er)...</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Info</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Start kommunikasjon</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Legg inn plan</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Ugyldig dybde - kunne ikke lese &quot;%s&quot;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Ugyldig dybde - dykk dypere enn 400m støttes ikke</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Ugyldig gass i rad %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Ugyldig starttid</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Ugyldig brukeridentifikator!</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">jan</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">jul</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">jun</translation>
-    </message>
-    <message>
-        <source>Last stop at 20 Feet</source>
-        <translation type="obsolete">Siste stopp ved 20 fot</translation>
-    </message>
-    <message>
-        <source>Last stop at 6 Meters</source>
-        <translation type="obsolete">Siste stopp ved 6 meter</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Valg for utseende</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel med flere, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Liste</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">liter</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Sted</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Logg</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Lengste</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Lengste dykk</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Alarm: dårlig batteri</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Advarsel: dårlig batteri</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Karttilbyder</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">mar</translation>
-    </message>
-    <message>
-        <source>Mark invalid</source>
-        <translation type="obsolete">Merk som ugyldig</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Sett posisjon her</translation>
-    </message>
-    <message>
-        <source>Mark valid</source>
-        <translation type="obsolete">Marker som gyldig</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">markering</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">master</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Advarsel: maks dekotid</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Maks. dybde</translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Maksdybde (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Maks. SAC</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Maks. temp.</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Maks. dybde: %.*f %s
-Tid: %d min
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Maks CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Maks. trykk</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Maksimum</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Maksimum</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Maksimum</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">mai</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Slå sammen dykk</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Slå samme tur med turen over</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Slå sammen tur med turen under</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">meter</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Min. dybde</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Min. SAC</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Min. temp</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Ymse valg</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Modell</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">man</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Dykkelogg i C for flere plattformer</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Ny</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Nytt startnummer</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Neste DC</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Navn</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Ingen tankinformasjon</translation>
-    </message>
-    <message>
-        <source>No cylinders listed for this dive.</source>
-        <translation type="obsolete">Dette dykket har ingen flasker.</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notater</translation>
-    </message>
-    <message>
-        <source>Notes height (%d%% - %d%%)</source>
-        <translation type="obsolete">Notathøyde (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Notater øverst</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">nov</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">OLF</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">okt</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Feil ved retur fra pthread</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Er det greit å slette valgte oppføring?</translation>
-    </message>
-    <message>
-        <source>Only display dives with these tags:</source>
-        <translation type="obsolete">Bare vis dykk med disse emneordene:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Åpne fil</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Åpne...</translation>
-    </message>
-    <message>
-        <source>Ordering</source>
-        <translation type="obsolete">Sortering</translation>
-    </message>
-    <message>
-        <source>Other data height (%d%% - %d%%)</source>
-        <translation type="obsolete">Høyde på andre data (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Oksygen</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Alarm: oppstigning / PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Advarsel: oppstigning /PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Advarsel: grønn / PO2</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passord</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Velg på kart</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Planlegger</translation>
-    </message>
-    <message>
-        <source>Please enter your userid and password for divelogs.de. The selected dives will be added to your account</source>
-        <translation type="obsolete">Legg inn brukerid og passord for divelogs.de. De valgte dykkene blir lastet opp.</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Valg</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Valg...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Trykk</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Trykk:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Forrige DC</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">Fargeutskrift</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Skriv ut valgte dykk</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Skriv ut valg</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Utskriftstype</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Skriv ut...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Profil</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Profilinnstillinger</translation>
-    </message>
-    <message>
-        <source>Profile height (%d%% - %d%%)</source>
-        <translation type="obsolete">Profilhøyde (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Profil øverst</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Avslutt</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Alarm: gjenværende gasstid</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Advarsel: gjenværende gasstid</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Vurdering</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Leser %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Fjern</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Fjern tur</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Fjern dykk fra tur</translation>
-    </message>
-    <message>
-        <source>Remove event here</source>
-        <translation type="obsolete">Fjern hendelse her</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Fjern valgte dykk fra tur</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Oppdater nummerering</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Oppdater nummerering...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Prøv igjen</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">SAC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">SAC under dekostopp</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">SAC under dykk</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Brudd på sikkerhetsstopp</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">lør</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Lagre som...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Lagre endringer?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Lagre fil som</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Lagre som</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Lagre...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Deltid</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Velg hendelser</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Velg hendelser…</translation>
-    </message>
-    <message>
-        <source>Select Tags...</source>
-        <translation type="obsolete">Velg emneord...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">sep</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Fikk ikke skrevet ferdig req.txt
-Er Uemis Zurich plugget i ordentlig?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Korteste</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Korteste dykk</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Vis kolonner</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">Vis EAD, END, EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">Vis MOD</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Vis kalkulert tak</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Tak fra computer i rødt</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Vis i kart</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">Vis graf for pHe</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">Vis graf for pN%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">Vis graf for pO%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simulert dykk</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Størrelse</translation>
-    </message>
-    <message>
-        <source>Sizing heights (%% of layout)</source>
-        <translation type="obsolete">Størrelse på høyder (i %% av layout)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Alarm: oppstigningshastighet</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Advarsel: oppstigningshastighet</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Start</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Start nedlasting</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Statistikk</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Statistikk %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Statistikk</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Status</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Bli ved %.*f %s i %d:%02d min - kjøretid %d:%02u på %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Rar lesing av prosent %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Drakt</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">søn</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Overflateintervall</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Overflatetrykk (mbar)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Bytt gass til %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Tabellutskrift</translation>
-    </message>
-    <message>
-        <source>Tags are only shown if they are identical for all edited dives</source>
-        <translation type="obsolete">Emneord vises bare hvis de er identiske i alle redigerte dykk</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Tankbytte foreslått</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Info: tanktrykk</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Tek-innstillinger</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Temp</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Temperatur</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Temperatur:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Alle</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">tor</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Tid</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Dobbeltklikk oppføring i lista
-for å redigere et dykk.</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zoom av/på</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">For mange gassmikser</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">For mange rader</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Total</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Total tid</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Total vekt:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Overgang til %.*f %s i %d:%02d min - kjøretid %d:%02u på %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Tur %1$s. %3$d. %2$s %4$d (%5$d dykk)</numerusform>
-            <numerusform>Tur %1$s. %3$d. %2$s %4$d (%5$d dykk)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">tir</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Type</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zurich: Filsystem er nesten fullt
-Koble fra og til dykkecomputeren og
-klikk &apos;Prøv igjen&apos;</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zurich: Fullt filsystem
-Koble fra og til dykkecomputeren
-og prøv igjen</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Klarer ikke å lese fra Uemis</translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">Kunne ikke opprette kontekst for libdivecomputer</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Kunne ikke lage parser for %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Fikk ikke åpnet %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Enheter</translation>
-    </message>
-    <message>
-        <source>Upload dive(s) to divelogs.de</source>
-        <translation type="obsolete">Last opp dykk til divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de</source>
-        <translation type="obsolete">Last opp til divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de...</source>
-        <translation type="obsolete">Last opp til divelogs.de...</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Høyreklikk for å velge dykkested</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Brukeridentifikator</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Brukermanual</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Vis</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Sikt</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Volum:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">V</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Advarsel - ekstremt lange dykk tar lang tid å prosessere</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Advarsel - svært dype dykk tar lang tid å prosessere</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Vanntemperatur</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Nettjeneste</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">ons</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Vekt</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Vektsystem</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Vekt:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">XML-fil</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">År</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Årsstatistikk</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">Du har allerede en dykkecomputer med denne
-modellen ved navn %s
-Subsurface kan vedlikeholde et navn for denne computeren for å skille den fra en annen. Standarden er modell og enhets-ID som vist under.
-Hvis du ikke har lyst til å gi et navn til denne computeren, trykk &apos;Avbryt&apos; og Subsurface vil vise modellen som navn.  Dette kan bety at du ikke ser forskjell på to like computere i loggen.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Du har endringer som ikke er lagret.
-Vil du lagre disse før du lukker datafila?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Du har endringer som ikke er lagret i %s.
-Vil du lagre disse før du lukker fila?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">luft</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">lufttid</translation>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">høydedykk</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">ankelvekt</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">oppstigning</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">p-vekt</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">vektbelte</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">båt</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">bokmerke</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">grotte</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">hule</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">tak</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">tak (sikkerhetsstopp)</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">clip-on</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">ft³</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">data</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">deko</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">dekostopp</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">dypdykk</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">dypstopp</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">id for oppføring i logg</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">id for dykkesteddata</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">dykketid</translation>
-    </message>
-    <message>
-        <source>drift</source>
-        <translation type="obsolete">strømdykk</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">tørrdrakt</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">for alle dykk</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">for dykk #%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">for dykk #</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">for valgte dykk</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">for valgte dykk</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">ferskvann</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">ft</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">hel drakt</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">gassbytte</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">retning</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">isdykk</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">integrert bly</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">ugyldig</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">ugyldig hendelsesnummer</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">overdel</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">innsjø</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">pund</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">ermeløs våtdrakt</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">maks ppO₂</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">maks CNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">maksdybde</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">skalldrakt</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">Min</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">mer data dykke-id</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">mer enn %d dager</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">nattdykk</translation>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">tid uten stopp</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">ingen</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">grense for pHe</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">grense for pN%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">grense for pO%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">pascal</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">foto</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">basseng</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">rbt</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">elv</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">sikkerhetsstopp</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">sikkerhetsstopp (obligatorisk)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">sikkerhetsstopp (frivillig)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">semidry</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">landdykk</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">shorty</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">overflate</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">undervisning</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">Advarsel: nivå i vev</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">trening</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">Henrik Brautaset Aronsen</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">sender</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">ukjent</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">ukjent</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">ikke spesifisert</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">vest</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">video</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">brudd</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">Vekt</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">våtdrakt</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">arbeidsbelastning</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">vrakdykk</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb_NO" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialogboks</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer fil (CSV)</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Feltseparator</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Feltkonfigurasjon</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Tid</translation>
+        <translation>Tid</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Dybde</translation>
+        <translation>Dybde</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Temp</translation>
+        <translation>Temp</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation>CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation>Stoppdybde</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation>Prekonfigurerte importer</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation>Åpne CSV-loggfil</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation>CSV-filer (*.csv)</translation>
     </message>
 </context>
 <context>
@@ -2390,57 +77,57 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Type</translation>
+        <translation>Type</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Størrelse</translation>
+        <translation>Størrelse</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Trykkrating</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Starttrykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Sluttrykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation>O₂%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation>He</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation>Gassbytte ved</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å fjerne denne flaska.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation>Flaska kan ikke fjernes</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Denne gassen er i bruk. Du kan bare fjerne flasker som ikke er i bruk.</translation>
     </message>
 </context>
 <context>
@@ -2448,41 +135,41 @@ tranlators here
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Rediger navn for dykkecomputer</translation>
+        <translation>Rediger navn for dykkecomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation>Fjerne den valgte computeren?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vil du fjerne den valgte computeren?</translation>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Modell</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Modell</translation>
+        <source>Device ID</source>
+        <translation>Enhets-ID</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Navn</translation>
+        <translation>Navn</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å fjerne denne computeren.</translation>
     </message>
 </context>
 <context>
@@ -2490,12 +177,12 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation>l/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation>ft³/min</translation>
     </message>
 </context>
 <context>
@@ -2503,95 +190,87 @@ tranlators here
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis søkeboks</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation>vis alle</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation>slå sammen alle</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation>slå sammen andre</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation>fjern dykk fra tur</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation>legg til ny tur over denne</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation>legg dykk til turen over</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation>slå sammen tur med turen over</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation>slå sammen tur med turen under</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>slett dykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation>lagre som</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation>eksporter som UDDF</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation>forskyvning av tidspunkter</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lagre dykk som...</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation>Lagre som</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Slå samme tur med turen over</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Slå sammen tur med turen under</translation>
+        <translation>UDDF-filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation>slå sammen valgte dykk</translation>
     </message>
 </context>
 <context>
@@ -2599,48 +278,48 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Skjema</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation>SAC på bunn</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>SAC under deko</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation>GF høy</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation>GF lav</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation>Siste stopp på 6m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Starttid</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Trykk ATA</translation>
     </message>
 </context>
 <context>
@@ -2648,23 +327,24 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation>10m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation>30ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Handler Position-feil</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation>En eller flere av stoppene dine vil bli tapt hvis du fortsetter.
+Fjern dem før du gjør dette.</translation>
     </message>
 </context>
 <context>
@@ -2672,37 +352,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">Luft</translation>
+        <translation>Luft</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Siste dybde</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Varighet</translation>
+        <translation>Varighet</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation>Brukt gass</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation>CC setpoint</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation>Forkaste planen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation>Du er i ferd med å forkaste planen.</translation>
     </message>
 </context>
 <context>
@@ -2710,17 +390,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation>Punkter i dykkeplan</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation>Tilgjengelige gasser</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation>legg til datapunkt</translation>
     </message>
 </context>
 <context>
@@ -2728,67 +408,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Dato</translation>
+        <translation>Dato</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">Min</translation>
+        <translation>Min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">pund</translation>
+        <translation>pund</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Drakt</translation>
+        <translation>Drakt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Flaske</translation>
+        <translation>Flaske</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">maks CNS</translation>
+        <translation>maks CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Sted</translation>
+        <translation>Sted</translation>
     </message>
 </context>
 <context>
@@ -2797,17 +477,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Feil</translation>
+        <translation>Feil</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Prøv igjen</translation>
+        <translation>Prøv igjen</translation>
     </message>
 </context>
 <context>
@@ -2815,47 +495,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Last ned fra dykkecomputer</translation>
+        <translation>Last ned fra dykkecomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation>Leverandør</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Dykkecomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation>Enhet eller disk</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Tvungen nedlasting av alle dykk</translation>
+        <translation>Tvungen nedlasting av alle dykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation>Foretrekk alltid nedlastede dykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Avbryt</translation>
     </message>
 </context>
 <context>
@@ -2863,225 +543,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation>TabWidget</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Dykk</translation>
+        <translation>Dykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation>Starttid</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation>Temperatur i vann / luft</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Sted</translation>
+        <translation>Sted</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation>Koordinater</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Dykkeleder</translation>
+        <translation>Dykkeleder</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Buddy</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation>Emner</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Vurdering</translation>
+        <translation>Vurdering</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Sikt</translation>
+        <translation>Sikt</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Drakt</translation>
+        <translation>Drakt</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Notater</translation>
+        <translation>Notater</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Utstyr</translation>
+        <translation>Utstyr</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Informasjon</translation>
+        <translation>Informasjon</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Dato</translation>
+        <translation>Dato</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation>Intervall</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Gasser</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation>Gasskonsum</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Maksdybde</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Snittdybde</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Lufttrykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Lufttemperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Vanntemperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Starttid</translation>
+        <translation>Starttid</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation>Saltholdighet</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Statistikk</translation>
+        <translation>Statistikk</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Dybde</translation>
+        <translation>Dybde</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatur</translation>
+        <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Varighet</translation>
+        <translation>Varighet</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Total tid</translation>
+        <translation>Total tid</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Dykk</translation>
+        <translation>Dykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Flasker</translation>
+        <translation>Flasker</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Legg til flaske</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation>Vekter</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation>Legg til vektsystem</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Tursted</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Turnotater</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation>Denne turen redigeres. Velg Lagre eller Avbryt når du er ferdig.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation>Flere dykk redigeres. Velg Lagre eller Avbryt når du er ferdig.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dykket redigeres. Velg Lagre eller Avbryt når du er ferdig.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -3090,32 +770,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation>/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">ukjent</translation>
+        <translation>ukjent</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">Ø</translation>
+        <translation>Ø</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">V</translation>
+        <translation>V</translation>
     </message>
 </context>
 <context>
@@ -3123,417 +803,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Fil</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Logg</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Vis</translation>
+        <translation>Hovedvindu</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Hjelp</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Fil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Logg</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Vis</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hjelp</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Importer</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ny loggbok</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Ny</translation>
+        <translation>Ny</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Åpne loggbok</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Åpne</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Lagre</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Lagre</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Lagre som</translation>
+        <translation>Lagre som</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Lukk</translation>
+        <translation>Lukk</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer filer</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksporter &amp;UDDF</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Skriv ut</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+,</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Avslutt</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer fra &amp;dykkecomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer &amp;GPS-data fra Subsurface-tjenesten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation>%Rediger enhetsnavn</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl++</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation>%Nummerer på nytt</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation>Bytt %Zoom</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Årlig statistikk</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste over dykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Profil</translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Info</translation>
+        <translation>Info</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>Bruker&amp;manual</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation>Globus</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation>P%lanlegg dykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer CSV</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer CS%V</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer fra divelogs.de</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Valg</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Avslutt</translation>
+        <translation>Valg</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Rediger enhetsnavn</translation>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Oppdater nummerering</translation>
+        <translation>Nytt dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zoom av/på</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Årsstatistikk</translation>
+        <translation>Autogruppering</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+2</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+3</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+4</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Forrige DC</translation>
+        <translation>Forrige DC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Venstre</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Neste DC</translation>
+        <translation>Neste DC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Høyre</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Velg hendelser</translation>
+        <translation>Velg hendelser</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Legg inn plan</translation>
+        <translation>Legg inn plan</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Om Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Brukermanual</translation>
+        <translation>Om Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation>F1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+5</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Åpne fil</translation>
+        <translation>Åpne fil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation>Finner ikke manualen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vil du lagre endringene i %1?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vil du endre lagringene?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Lagre endringer?</translation>
+        <translation>Lagre endringer?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Endringer vil gå tapt hvis du ikke lagrer.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation>Lagre som</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3543,17 +1183,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Advarsel</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation>UDDF-filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -3561,289 +1201,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialogboks</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardvalg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Enheter</translation>
+        <translation>Enheter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation>Graf</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation>Lister og tabeller</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrifttype</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriftstørrelse</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Dykk</translation>
+        <translation>Dykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard dykkelogg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis ugyldige</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardflaske</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Bruk standardflaske</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation>System</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation>Metrisk</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation>Britiske mål</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation>Personaliser</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Dybde</translation>
+        <translation>Dybde</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">meter</translation>
+        <translation>meter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">fot</translation>
+        <translation>fot</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Trykk</translation>
+        <translation>Trykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation>Psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Volu</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">liter</translation>
+        <translation>liter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">ft³</translation>
+        <translation>ft³</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatur</translation>
+        <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">celsius</translation>
+        <translation>celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">fahrenheit</translation>
+        <translation>fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Vekt</translation>
+        <translation>Vekt</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation>Kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">pund</translation>
+        <translation>pund</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidsenheter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation>Nevner for opp-/nedstigningshastighet</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>Minutter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Sekunder</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation>terskel</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation>pN₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation>pHe</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation>MOD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation>max ppO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation>EAD END EADD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak fra dykkecomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation>vis tak med rød farge</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation>Kalkulert tak</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation>vis alle vev</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation>3-meterstrinn</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation>Regn ut NDL/TTS</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation>GF lav ved maksdybde</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Ymse</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation>GF lav</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation>GF høy</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation>Åpne standardlogg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -3851,7 +1491,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Skriv ut</translation>
     </message>
 </context>
 <context>
@@ -3859,37 +1499,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Dykk nr.</translation>
+        <translation>Dykk nr.</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Dato</translation>
+        <translation>Dato</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Dybde</translation>
+        <translation>Dybde</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Varighet</translation>
+        <translation>Varighet</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">master</translation>
+        <translation>master</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Buddy</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Sted</translation>
+        <translation>Sted</translation>
     </message>
 </context>
 <context>
@@ -3897,84 +1537,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Skjema</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation>Utskriftsvalg</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Skriv ut valgte dykk</translation>
+        <translation>Skriv ut valgte dykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">Fargeutskrift</translation>
+        <translation>Fargeutskrift</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Utskriftstype</translation>
+        <translation>Utskriftstype</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 dykk per side</translation>
+        <translation>6 dykk per side</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 dykk per side</translation>
+        <translation>2 dykk per side</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Tabellutskrift</translation>
+        <translation>Tabellutskrift</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished">Sortering</translation>
+        <translation>Sortering</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Profil øverst</translation>
+        <translation>Profil øverst</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Notater øverst</translation>
+        <translation>Notater øverst</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation>Størrelse på høyder (i % av layout)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilhøyder (43% - 85%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Høyde på andre data (8% - 17%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Notathøyde (0% -52%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation>0</translation>
     </message>
 </context>
 <context>
@@ -3982,87 +1622,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation>Skjul hendelser</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation>Skjul alle %1 hendelser?</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation>Fjern den valgte hendelsen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 @ %2:%3</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation>ukjent dykkecomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>Varighet: 10 minutter</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation>Målestokk</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation>Linjal</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation>Mål egenskaper ved dykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation>Skaler dykket til skjermstørrelsen</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Rediger</translation>
+        <translation>Rediger</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">luft</translation>
+        <translation>luft</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation>EAN%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Bytter til OC</translation>
+        <translation>Bytter til OC</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> start</translation>
+        <translation> start</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> slutt</translation>
+        <translation> slutt</translation>
     </message>
 </context>
 <context>
@@ -4070,62 +1710,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">ukjent</translation>
+        <translation>ukjent</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Dykk #%1- %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Max dybde: %1 %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation>Varighet: %1 min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Flaske</translation>
+        <translation>Flaske</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Gassmiks</translation>
+        <translation>Gassmiks</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Gass</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Maks CNS</translation>
+        <translation>Maks CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation>Vekter</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation>Totalvekt</translation>
     </message>
 </context>
 <context>
@@ -4133,50 +1773,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">Luft</translation>
+        <translation>Luft</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation>Fjern dette punktet</translation>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen stedsdata - finn sted i kartet og dobbelklikk for å sette posisjon</translation>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation>Redigerer dykk - finn sted i kartet og dobbeltklikk for å sette posisjon</translation>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Lukk</translation>
+        <translation>Lukk</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Gjennomsnitt</translation>
+        <translation>Gjennomsnitt</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished">Minimum</translation>
+        <translation>Minimum</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished">Maksimum</translation>
+        <translation>Maksimum</translation>
     </message>
 </context>
 <context>
@@ -4184,12 +1816,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Oppdater nummerering</translation>
+        <translation>Oppdater nummerering</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Nytt startnummer</translation>
+        <translation>Nytt startnummer</translation>
     </message>
 </context>
 <context>
@@ -4197,27 +1829,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation>Flytt valgte tidspunkter</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation>Flytt valgte tidspunkter ved</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation>tidligere</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation>senere</translation>
     </message>
 </context>
 <context>
@@ -4225,27 +1857,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Om Subsurface</translation>
+        <translation>Om Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekstetikett</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Lisens</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Webside</translation>
     </message>
 </context>
 <context>
@@ -4253,37 +1885,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Nettjeneste</translation>
+        <translation>Nettjeneste</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vent litt...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation>Nedlasting er ferdig</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Feil med forbindelse</translation>
+        <translation>Feil med forbindelse</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Ugyldig brukeridentifikator!</translation>
+        <translation>Ugyldig brukeridentifikator!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Kan ikke lese svar!</translation>
+        <translation>Kan ikke lese svar!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Ferdig å laste ned</translation>
+        <translation>Ferdig å laste ned</translation>
     </message>
 </context>
 <context>
@@ -4291,30 +1923,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Skjema</translation>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Legg til flaske</translation>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <source>Description</source>
+        <translation>Beskrivelse</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation>Ml</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
@@ -4322,20 +1954,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informasjon</translation>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation>Beskrivelse</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -4343,37 +1975,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Last ned stedsdata</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation>Status:</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv ID-en din her</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Last ned</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Bruker-ID</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Passord</translation>
+        <translation>Passord</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation>Last opp</translation>
     </message>
 </context>
 <context>
@@ -4381,17 +2013,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Type</translation>
+        <translation>Type</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Vekt</translation>
+        <translation>Vekt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å fjerne dette vektsystemet</translation>
     </message>
 </context>
 <context>
@@ -4400,42 +2032,48 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation>År
+&gt; Måned / Tur</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation>Varighet
+Total</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Snitt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Kortest</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Lengst</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Dybde (%1)
+Snitt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4443,7 +2081,8 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Minimum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4451,19 +2090,22 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Maksimum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>SAC (%1)
+Snitt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Temp. (%1)
+Snitt</translation>
     </message>
 </context>
 <context>
@@ -4471,64 +2113,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">pascal</translation>
+        <translation>pascal</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">ft³</translation>
+        <translation>ft³</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">pund</translation>
+        <translation>pund</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) eller (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s. %3$d. %2$s %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) eller (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4538,32 +2176,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">luft</translation>
+        <translation>luft</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">integrert bly</translation>
+        <translation>integrert bly</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">vektbelte</translation>
+        <translation>vektbelte</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">ankelvekt</translation>
+        <translation>ankelvekt</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">p-vekt</translation>
+        <translation>p-vekt</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">clip-on</translation>
+        <translation>clip-on</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4573,314 +2211,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Kunne ikke åpne &apos;%s&apos;</translation>
+        <translation>Kunne ikke åpne &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klarte ikke å lese &apos;%s&apos;. Bruk CSV-importen isteden.</translation>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation>Maks antall kolonner i CSV-importen er %d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">ingen</translation>
+        <translation>ingen</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">dekostopp</translation>
+        <translation>dekostopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">rbt</translation>
+        <translation>rbt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">oppstigning</translation>
+        <translation>oppstigning</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">tak</translation>
+        <translation>tak</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">arbeidsbelastning</translation>
+        <translation>arbeidsbelastning</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">sender</translation>
+        <translation>sender</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">brudd</translation>
+        <translation>brudd</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">bokmerke</translation>
+        <translation>bokmerke</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">overflate</translation>
+        <translation>overflate</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">sikkerhetsstopp</translation>
+        <translation>sikkerhetsstopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">gassbytte</translation>
+        <translation>gassbytte</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">sikkerhetsstopp (frivillig)</translation>
+        <translation>sikkerhetsstopp (frivillig)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">sikkerhetsstopp (obligatorisk)</translation>
+        <translation>sikkerhetsstopp (obligatorisk)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">dypstopp</translation>
+        <translation>dypstopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">tak (sikkerhetsstopp)</translation>
+        <translation>tak (sikkerhetsstopp)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation>under tak</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">dykketid</translation>
+        <translation>dykketid</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">maksdybde</translation>
+        <translation>maksdybde</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">OLF</translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">lufttid</translation>
+        <translation>lufttid</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">retning</translation>
+        <translation>retning</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">Advarsel: nivå i vev</translation>
+        <translation>Advarsel: nivå i vev</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">tid uten stopp</translation>
+        <translation>tid uten stopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">ugyldig hendelsesnummer</translation>
+        <translation>ugyldig hendelsesnummer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Kunne ikke lage parser for %s %s</translation>
+        <translation>Kunne ikke lage parser for %s %s</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Feil ved registrering av data</translation>
+        <translation>Feil ved registrering av data</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Feil ved lesing av dato</translation>
+        <translation>Feil ved lesing av dato</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Dykk #%d: %s %d %04d</translation>
+        <translation>Dykk #%d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Feil ved lesing av dykketid</translation>
+        <translation>Feil ved lesing av dykketid</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Feil ved lesing av maksdybde</translation>
+        <translation>Feil ved lesing av maksdybde</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Feil ved lesing av gassmiksantall</translation>
+        <translation>Feil ved lesing av gassmiksantall</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Feil ved lesing av salthetsgrad</translation>
+        <translation>Feil ved lesing av salthetsgrad</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Klarte ikke å hente overflatetrykk</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Feil ved lesing av gassmiks</translation>
+        <translation>Feil ved lesing av gassmiks</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Feil ved lesing av detaljer</translation>
+        <translation>Feil ved lesing av detaljer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Hendelse: Venter på bruker</translation>
+        <translation>Hendelse: Venter på bruker</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)</translation>
+        <translation>modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Feil ved registrering av hendelseshåndterer.</translation>
+        <translation>Feil ved registrering av hendelseshåndterer.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Feil ved registrering av avbruddshåndterer.</translation>
+        <translation>Feil ved registrering av avbruddshåndterer.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Feil ved import av dykkedata</translation>
+        <translation>Feil ved import av dykkedata</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">Kunne ikke opprette kontekst for libdivecomputer</translation>
+        <translation>Kunne ikke opprette kontekst for libdivecomputer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Fikk ikke åpnet %s %s (%s)</translation>
+        <translation>Fikk ikke åpnet %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Rar lesing av prosent %s
+        <translation>Rar lesing av prosent %s
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Kunne ikke lese &apos;%s&apos;.
+        <translation>Kunne ikke lese &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Kunne ikke lese &apos;%s&apos;</translation>
+        <translation>Kunne ikke lese &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished">Databasespørring get_eventes feilet.
+        <translation>Databasespørring get_eventes feilet.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished">Databaseforbindelse feiled &apos;%s&apos;.
+        <translation>Databaseforbindelse feiled &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished">Databasespørring feilen &apos;%s&apos;.
+        <translation>Databasespørring feilen &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">Kan ikke åpne stilark (%s)/%s</translation>
+        <translation>Kan ikke åpne stilark (%s)/%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Finner ikke gassen %d/%d</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Tank fra plan</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simulert dykk</translation>
+        <translation>Finner ikke gassen %d/%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">For mange gassmikser</translation>
+        <translation>For mange gassmikser</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4889,7 +2519,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Subsurface dykkeplan
 basert på GFlow = %.0f og GFhigh = %.0f
 
@@ -4899,166 +2529,166 @@ basert på GFlow = %.0f og GFhigh = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Overgang til %.*f %s i %d:%02d min - kjøretid %d:%02u på %s
+        <translation>Overgang til %.*f %s i %d:%02d min - kjøretid %d:%02u på %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Bli ved %.*f %s i %d:%02d min - kjøretid %d:%02u på %s
+        <translation>Bli ved %.*f %s i %d:%02d min - kjøretid %d:%02u på %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Bytt gass til %s
+        <translation>Bytt gass til %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Gasskonsum:
+        <translation>Gasskonsum:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s av %s
+        <translation>%.0f%s på %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 P:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+V:%.2f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Kalkulert tak %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Vev %.0fmin: %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Sikkerhetsstopp:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>@:%d:%02d
+D:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+SAC:%2.1fl/min</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Sikkerhetsstopp: ukjent tid @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deko:ukjent tid @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 I deko</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
@@ -5067,7 +2697,7 @@ MOD:%d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 EAD:%d%s
 END:%d%s
 EADD:%d%s</translation>
@@ -5076,352 +2706,342 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Deko:%umin @ %.0f %s (kalk)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+I deko (kalk)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+NDL:%umin (kalk)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+TTS:%umin (kalk)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s %sD:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%s %sD:%.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s %sP:%d %s</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation>C</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation>F</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2, %3
+%4:%5</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2 (%3 dykk)</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">ugyldig</translation>
+        <translation>%1 %2 (1 dykk)</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">båt</translation>
+        <translation>båt</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">landdykk</translation>
+        <translation>landdykk</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished">strømdykk</translation>
+        <translation>strømdykk</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">dypdykk</translation>
+        <translation>dypdykk</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">hule</translation>
+        <translation>hule</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">isdykk</translation>
+        <translation>isdykk</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">vrakdykk</translation>
+        <translation>vrakdykk</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">grotte</translation>
+        <translation>grotte</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">høydedykk</translation>
+        <translation>høydedykk</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">basseng</translation>
+        <translation>basseng</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">innsjø</translation>
+        <translation>innsjø</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">elv</translation>
+        <translation>elv</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">nattdykk</translation>
+        <translation>nattdykk</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation>ferskvan</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">ferskvann</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">trening</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">undervisning</translation>
+        <translation>elev</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">foto</translation>
+        <translation>foto</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">video</translation>
+        <translation>video</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation>instruktør</translation>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">deko</translation>
+        <translation>deko</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">mer enn %d dager</translation>
+        <translation>mer enn %d dager</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dt %dt %dmin</translation>
+        <translation>%dt %dt %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dt %dmin</translation>
+        <translation>%dt %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">for dykk #</translation>
+        <translation>for dykk #</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">for valgte dykk</translation>
+        <translation>for valgte dykk</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">for dykk #%d</translation>
+        <translation>for dykk #%d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">for valgte dykk</translation>
+        <translation>for valgte dykk</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">for alle dykk</translation>
+        <translation>for alle dykk</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(ingen dykk)</translation>
+        <translation>(ingen dykk)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">søn</translation>
+        <translation>søn</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">man</translation>
+        <translation>man</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">tir</translation>
+        <translation>tir</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">ons</translation>
+        <translation>ons</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">tor</translation>
+        <translation>tor</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">fre</translation>
+        <translation>fre</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">lør</translation>
+        <translation>lør</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">jan</translation>
+        <translation>jan</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">feb</translation>
+        <translation>feb</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">mar</translation>
+        <translation>mar</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">apr</translation>
+        <translation>apr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">mai</translation>
+        <translation>mai</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">jun</translation>
+        <translation>jun</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">jul</translation>
+        <translation>jul</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">aug</translation>
+        <translation>aug</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">sep</translation>
+        <translation>sep</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">okt</translation>
+        <translation>okt</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">nov</translation>
+        <translation>nov</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">des</translation>
+        <translation>des</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zurich: Filsystem er nesten fullt
+        <translation>Uemis Zurich: Filsystem er nesten fullt
 Koble fra og til dykkecomputeren og
 klikk &apos;Prøv igjen&apos;</translation>
     </message>
@@ -5430,7 +3050,7 @@ klikk &apos;Prøv igjen&apos;</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zurich: Fullt filsystem
+        <translation>Uemis Zurich: Fullt filsystem
 Koble fra og til dykkecomputeren
 og prøv igjen</translation>
     </message>
@@ -5438,193 +3058,193 @@ og prøv igjen</translation>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Fikk ikke skrevet ferdig req.txt
+        <translation>Fikk ikke skrevet ferdig req.txt
 Er Uemis Zurich plugget i ordentlig?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">ukjent</translation>
+        <translation>ukjent</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Leser %s %s</translation>
+        <translation>Leser %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">data</translation>
+        <translation>data</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">id for oppføring i logg</translation>
+        <translation>id for oppføring i logg</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">id for dykkesteddata</translation>
+        <translation>id for dykkesteddata</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">mer data dykke-id</translation>
+        <translation>mer data dykke-id</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">våtdrakt</translation>
+        <translation>våtdrakt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">semidry</translation>
+        <translation>semidry</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">tørrdrakt</translation>
+        <translation>tørrdrakt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">shorty</translation>
+        <translation>shorty</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">vest</translation>
+        <translation>vest</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">ermeløs våtdrakt</translation>
+        <translation>ermeløs våtdrakt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">overdel</translation>
+        <translation>overdel</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">hel drakt</translation>
+        <translation>hel drakt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">todelt drakt</translation>
+        <translation>todelt drakt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">skalldrakt</translation>
+        <translation>skalldrakt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Start kommunikasjon</translation>
+        <translation>Start kommunikasjon</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Klarer ikke å lese fra Uemis</translation>
+        <translation>Klarer ikke å lese fra Uemis</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Start nedlasting</translation>
+        <translation>Start nedlasting</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Brudd på sikkerhetsstopp</translation>
+        <translation>Brudd på sikkerhetsstopp</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Alarm: oppstigningshastighet</translation>
+        <translation>Alarm: oppstigningshastighet</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Advarsel: oppstigningshastighet</translation>
+        <translation>Advarsel: oppstigningshastighet</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Advarsel: grønn / PO2</translation>
+        <translation>Advarsel: grønn / PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Advarsel: oppstigning /PO2</translation>
+        <translation>Advarsel: oppstigning /PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Alarm: oppstigning / PO2</translation>
+        <translation>Alarm: oppstigning / PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Info: tanktrykk</translation>
+        <translation>Info: tanktrykk</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Advarsel: gjenværende gasstid</translation>
+        <translation>Advarsel: gjenværende gasstid</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Alarm: gjenværende gasstid</translation>
+        <translation>Alarm: gjenværende gasstid</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Tankbytte foreslått</translation>
+        <translation>Tankbytte foreslått</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Maksgrense for dybde overskredet</translation>
+        <translation>Maksgrense for dybde overskredet</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Advarsel: maks dekotid</translation>
+        <translation>Advarsel: maks dekotid</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Info: dykketid</translation>
+        <translation>Info: dykketid</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Alarm: dykketid</translation>
+        <translation>Alarm: dykketid</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">markering</translation>
+        <translation>markering</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Ingen tankinformasjon</translation>
+        <translation>Ingen tankinformasjon</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Advarsel: dårlig batteri</translation>
+        <translation>Advarsel: dårlig batteri</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Alarm: dårlig batteri</translation>
+        <translation>Alarm: dårlig batteri</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index 518180bc0..18c34d175 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -1,2389 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="nl_NL">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-Geen gebeurtenissen
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete"> &gt; Maand</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete">Download</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete"> Selecteer duikcomputer en aansluiting. </translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> begin</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> eind</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">Nr.</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s%2$s %4$d %3$s %5$d %6$02d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d %2$s %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d %2$s %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %3$d %2$s %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dd %du %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%du %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-Berekend plafond %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deco:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deco:onbek.tijd @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-In deco</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL:%umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-P:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Veiligheidsstop:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Veiligheidsstop:onbek.tijd @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Subsurface duikplan
-Gebaseerd op GFlow =  %.0f en GFhigh = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s event at %d:%02u</source>
-        <translation type="obsolete">%s gebeurtenis om %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s: Response from divelogs.de</source>
-        <translation type="obsolete">%s: Antwoord van divelogs.de</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) of (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(klik om datum/tijd te bewerken)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(klik om datum/tijd/diepte te bewerken)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(geen duiken)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(niets)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 cuft/min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 cuft/min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17L/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 duiken per bladzijde</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">2-delig pak</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20L/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">stappen van 3m voor berekend plafond</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 duiken per bladzijde</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;Add segments below.
-Each line describes part of the planned dive.
-An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. &apos;+3:30&apos;) or ends at the given time (if absolute e.g &apos;@5:00&apos;, &apos;runtime&apos;), and uses the given gas.
-An empty gas means &apos;use previous gas&apos; (or AIR if no gas was specified).
-An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.
-CC SetPoint specifies CC (rebreather) dives, leave empty for OC.&lt;/small&gt;
-</source>
-        <translation type="obsolete">&lt;small&gt;Voeg etappes hieronder toe.
-Elke invoerregel beschrijft een deel van de geplande duik.
-Een invoerregel met diepte, tijd en gas beschrijft een etappe die eindigt op de gegeven diepte, de gegeven tijd duurt (indien relatief, bijv.  &apos;+3:30&apos;) of eindigt op de gegeven tijd (indien absoluut) en gebruik maakt van het opgegeven gasmengsel.
-Een leeggelaten gasmengsel betekent &apos;gebruik vorig gasmengsel&apos; (of AIR als geen gasmengsel opgegeven is).
-Een invoer die een diepte en een gas heeft, maar geen tijd, is speciaal: het vertelt de planner dat het opgegeven gasmengsel beschikbaar is voor de opstijging wanneer de opgegeven diepte is bereikt.
-CC Instelpunt specificeert CC (rebreather) duiken, dit veld wordt niet ingevuld voor OC.&lt;/small&gt;
-</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">AIR</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">Over Subsurface</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Toevoegen</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Duik toevoegen...</translation>
-    </message>
-    <message>
-        <source>Add bookmark event here</source>
-        <translation type="obsolete">Voeg bladwijzer hier toe</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Duik Toevoegen</translation>
-    </message>
-    <message>
-        <source>Add gas change event here</source>
-        <translation type="obsolete">Voeg gaswissel hier toe</translation>
-    </message>
-    <message>
-        <source>Add gaschange event at %d:%02u</source>
-        <translation type="obsolete">Voeg gaswissel toe op %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Trip hierboven toevoegen</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Voeg routepunt toe.</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Luchtdruk</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Luchttemp.</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Luchttemp. in %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Prefereer altijd de gedownloadde duik</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">apr</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">aug</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Automatisch groeperen</translation>
-    </message>
-    <message>
-        <source>Available gases</source>
-        <translation type="obsolete">Beschikbare gasmengsels</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Gemiddelde</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Gemiddelde</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Gemiddelde</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Gemiddelde</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Gem. diepte</translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Gem. Diepte (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">Gem. gasverbruik</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Gem. temp.</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Gem. tijd</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Schakel om naar OC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Buddy</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CC Instelpunt</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Kan gasmengsel %d/%d niet vinden</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">Kan stylesheet (%s)/%s niet openen</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Geännuleerd, zonder problemen afgesloten...</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Geännuleerd...</translation>
-    </message>
-    <message>
-        <source>Cannot add gas change</source>
-        <translation type="obsolete">Gaswissel kan niet toegevoegd worden</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Kan antwoord niet parsen!</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">celsius</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Kies standaard XML bestand</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Kies de XML bestanden om te importeren in huidig data bestand</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Sluiten</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Alles inklappen</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Verbinding wordt opgezet.</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Verbindingsfout:</translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Nieuwe trip hierboven invoegen</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">cuft</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Fles</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Fles</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Fles voor planning</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Flessen</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">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>
-        <source>Database connection failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Databaseconnectie is mislukt &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Database-query mislukt: &apos;%s&apos;
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query get_events failed.
-</source>
-        <translation type="obsolete">Database-query get_events mislukt.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Datum en tijd</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Datum:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">dec</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">Standaard XML bestand</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Verwijder duikcomputerinformatie</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Duik verwijderen</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Duiken verwijderen</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Diepte</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Dieptelimiet overschreden</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Diepte:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Apparaat-ID</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Device of mountpoint</translation>
-    </message>
-    <message>
-        <source>Display invalid dives</source>
-        <translation type="obsolete">Geef ongeldige duiken weer</translation>
-    </message>
-    <message>
-        <source>Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</source>
-        <extracomment>++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-&lt;trailing text&gt;
-</extracomment>
-        <translation type="obsolete">Duik nr. %1$d - %2$s %4$02d-%3$02d-%5$04d om %6$d:%7$02d %8$s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Duik nr. %d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Duik nr. %d: %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Duikcomputer naam</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Duikinformatie</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Duiknotities</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Duikplan - DIT IS ENKEL EEN SIMULATIE; NIET GEBRUIKEN VOOR EEN WERKELIJKE DUIK</translation>
-    </message>
-    <message>
-        <source>Dive Tags</source>
-        <translation type="obsolete">Duik trefwoorden</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Duiktijd</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Alarm: Duiktijd</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Info: Duiktijd</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Duikcomputer merk en model</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Fout bij importeren van duikdata</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Duiklocaties</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Duikleider</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Wanneer begint de duik?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Duik nr.</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Duiklijst font</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Duikleider</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Duiken</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Duiklocaties</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Download uit duikcomputer</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Download uit duikcomputer...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Download van Webservice</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Download van Webservice...</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Laden succesvol voltooid!</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Duur</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Duur (min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">O</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Bewerken</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Apparaatnamen bewerken</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Bewerk duikcomputer apparaatnamen</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Trip informatie bewerken</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Trip overzicht bewerken</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Bewerk een duikcomputernaam door te dubbelklikken in het relevante apparaatnaamveld.</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Duik bewerken</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Datum/tijd van duik bewerken</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Duiken bewerken</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Bewerk meerdere duiken</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Trip overzicht bewerken</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">In-/uitschakelen gebeurtenissen</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Tags</source>
-        <translation type="obsolete">In/-uitschakelen trefwoorden</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Einde</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Einddiepte</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Voer een gebruikers-ID in en klik op &quot;Download&quot;. Wanneer de download voltooid is kunt u op &quot;Toepassen&quot; klikken als u de veranderingen wilt uitvoeren.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Uitrusting</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Fout</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Fout bij het verkrijgen van het zoutgehalte</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Fout bij verwerken van de datum en tijd</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Fout bij verwerken van de duikduur</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Fout bij het verwerken van het gasmengsel</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Fout bij het verwerken van het aantal gasmengsels</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Fout bij het verwerken van de maximum duikdiepte</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Fout bij het verwerken van de samples</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Fout bij het registreren van de cancellation handler.</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Fout bij het registreren van de data</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Fout bij het registreren van de event handler.</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Event: systime=%&lt;PRId64&gt;, devtime=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Event: wachten op handeling van gebruiker</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Alles uitklappen</translation>
-    </message>
-    <message>
-        <source>Export As UDDF File</source>
-        <translation type="obsolete">Exporteer naar UDDF-bestand</translation>
-    </message>
-    <message>
-        <source>Export UDDF...</source>
-        <translation type="obsolete">Exporteer UDDF...</translation>
-    </message>
-    <message>
-        <source>Export dive(s) to UDDF</source>
-        <translation type="obsolete">Exporteer duik(en) naar UDDF</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Fout bij openen van  %i bestanden.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Fout bij analyse van &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Fout bij analyseren van &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Fout bij lezen van &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Fout bij lezen van &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">feb</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">voet</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Bestand</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filter</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Forceer download van alle duiken</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Vr</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFhigh</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFhigh voor plan</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFlow</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFlow voor plan</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (WGS84 of GPS-formaat)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Gas verbruikt</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Gas verbruikt</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Gas gebruikt</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Gasverbruik:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Gasmengsel</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Algemene Instellingen</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Help</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">Inactief</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Importeer bestand(en)...</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Informatie</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Initialiseer communicatie</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Voer plan in</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Ongeldige diepte: kan &quot;%s&quot; niet verwerken</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Ongeldige diepte: dieptes groter dan 400m worden niet ondersteund</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Ongeldig gasmengsel voor regel %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Ongeldige starttijd</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Ongeldige gebruikersidentificatie</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">jan</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">jul</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">jun</translation>
-    </message>
-    <message>
-        <source>Last stop at 20 Feet</source>
-        <translation type="obsolete">Laatste stop op 20 voet</translation>
-    </message>
-    <message>
-        <source>Last stop at 6 Meters</source>
-        <translation type="obsolete">Laatste stop op 6 meter</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Opmaakopties</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel en anderen, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Lijst</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">liter</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Locatie</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Langste</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Langste duik</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Alarm: Lege batterij</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Waarschuwing:Lege batterij</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Kaartaanbieder</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">mar</translation>
-    </message>
-    <message>
-        <source>Mark invalid</source>
-        <translation type="obsolete">Markeer als ongeldig</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Markeer locatie hier</translation>
-    </message>
-    <message>
-        <source>Mark valid</source>
-        <translation type="obsolete">Markeer als geldig</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Markering</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Master</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Waarschuwing: Maximale deco-tijd</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Max. diepte</translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Max. diepte (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Max. gasverbruik</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Max. temp.</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Max. diepte: %.*f %s
-Duur: %d min
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Max. CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Max. druk</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Grootste</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Grootste</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Grootste</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">mei</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Duiken samenvoegen</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Trip met bovenstaande samenvoegen</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Trip met onderstaande samenvoegen</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">meter</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Min. diepte</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Min. gasverbruik</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Min. temp.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Kleinste</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Kleinste</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Kleinste</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Diverse opties</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Model</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Ma</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Multi-platform Duikprogramma in C</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nieuw</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Nieuw beginnummer</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Volgende DC</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Apparaatnaam</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Geen flesinformatie</translation>
-    </message>
-    <message>
-        <source>No cylinders listed for this dive.</source>
-        <translation type="obsolete">Geen flessen opgegeven voor deze duik.</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notities</translation>
-    </message>
-    <message>
-        <source>Notes height (%d%% - %d%%)</source>
-        <translation type="obsolete">Hoogte van notities (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Notities bovenaan</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">nov</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">OLF</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">okt</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Onbekende pthread foutmelding</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Geselecteerde gegevens wissen?</translation>
-    </message>
-    <message>
-        <source>Only display dives with these tags:</source>
-        <translation type="obsolete">Toon enkel duiken met de volgende trefwoorden:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Bestand openen</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Openen...</translation>
-    </message>
-    <message>
-        <source>Ordering</source>
-        <translation type="obsolete">Volgorde</translation>
-    </message>
-    <message>
-        <source>Other data height (%d%% - %d%%)</source>
-        <translation type="obsolete">Hoogte van overige data (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Zuurstof</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Alarm: Opstijging / PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Waarschuwing: Opstijging / PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Waarschuwing: PO2 Groen</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Wachtwoord</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Kies op kaart</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Planner</translation>
-    </message>
-    <message>
-        <source>Please enter your userid and password for divelogs.de. The selected dives will be added to your account</source>
-        <translation type="obsolete">Voer uw gebruikersnaam en wachtwoord voor divelogs.de in. De geselecteerde duiken zullen aan uw account worden toegevoegd.</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Instellingen</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Instellingen...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Druk</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Druk:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Vorige DC</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">Afdrukken in kleur</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Alleen geselecteerde duiken afdrukken</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Selectie afdrukken</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Afdruktype</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Afdrukken...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Profiel</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Profiel</translation>
-    </message>
-    <message>
-        <source>Profile height (%d%% - %d%%)</source>
-        <translation type="obsolete">Hoogte van profiel (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Profiel bovenaan</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Afsluiten</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Alarm: resterende gas-tijd</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Waarschuwing: resterende gas-tijd</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Waardering</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Lezen %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Verwijderen</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Trip verwijderen</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Duik uit trip verwijderen</translation>
-    </message>
-    <message>
-        <source>Remove event here</source>
-        <translation type="obsolete">Verwijder gebeurtenis hier</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Geselecteerde duiken uit trip verwijderen</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Hernummeren</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Hernummeren...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Opnieuw</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">Z</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">Gasverbruik</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">Gasverbruik tijdens decostop</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">Gasverbruik tijdens duik</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">veiligheidsstop overtreding</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Za</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Opslaan als...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Aanpassingen opslaan?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Bestand opslaan als</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Opslaan als...</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Opslaan...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Segment duur</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">gebeurtenissen selecteren</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">gebeurtenissen selecteren...</translation>
-    </message>
-    <message>
-        <source>Select Tags...</source>
-        <translation type="obsolete">Selecteer trefwoorden...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">sept</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Gedeeltelijke schrijfvoortgang naar req.txt bestand
-Is de Uemis Zurich correkt aangesloten?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Kortste</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Kortste duik</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Kolommen afbeelden</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">Toon EAD, END en EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">Toon MOD</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Toon berekend plafond</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Toon door duikcomputer aangegeven plafond in rood</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Toon op kaart</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">Toon pHe-grafiek</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">Toon pN%s-grafiek</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">Toon pO%s-grafiek</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Gesimuleerde duik</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Grootte</translation>
-    </message>
-    <message>
-        <source>Sizing heights (%% of layout)</source>
-        <translation type="obsolete">Instellen hoogtes (%% van opmaak)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Alarm: snelheid</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Waarschuwing: snelheid</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Start</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Begin download</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Statistieken</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Statistieken %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Statistieken</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Status</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Blijft op %.*f %s gedurende %d:%02d min - looptijd %d:%02u op %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Vreemde percentage %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Pak</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Zo</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Oppervlaktetijd</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Luchtdruk (mbar)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Gaswissel naar %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Afdrukken in tabelvorm</translation>
-    </message>
-    <message>
-        <source>Tags are only shown if they are identical for all edited dives</source>
-        <translation type="obsolete">Trefwoorden worden alleen getoond als zij identiek zijn voor alle te bewerken duiken</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Fleswissel voorgesteld</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Info: Flesdruk</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Tec instellingen</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Temperatuur</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Temperatuur</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Temperatuur:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Drie</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Tijd</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Om duikinformatie te bewerken
-dubbelklik op de duik in de duiklijst</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zoom in-/uitschakelen</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">Teveel gasmengsels</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">Teveel routepunten</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Totale</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Totale tijd</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Totaal gewicht:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Ga naar %.*f %s over %d:%02d min - looptijd %d:%02u op %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Trip %1$s %3$d %2$s %4$d (%5$d duik)</numerusform>
-            <numerusform>Trip %1$s %3$d %2$s %4$d (%5$d duiken)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Type</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zurich: Bestandssysteem bijna vol
-AUB de duikcomputer loskoppelen en weer aansluiten
-en klik op &apos;Opnieuw&apos;</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zurich: Bestandssysteem vol
-AUB de duikcomputer loskoppellen en weer aansluiten
-en probeer opnieuw</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Uemis niet geïnitialiseerd</translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">Kan geen context creëren voor libdivecomputer</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Kan geen parser creëren voor %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Fout bij openen van  %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Eenheden</translation>
-    </message>
-    <message>
-        <source>Upload dive(s) to divelogs.de</source>
-        <translation type="obsolete">Upload duik(en) naar divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de</source>
-        <translation type="obsolete">Upload naar divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de...</source>
-        <translation type="obsolete">Upload naar divelogs.de...</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Gebruik de rechtermuisknop om een duiklocatie te markeren</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Gebruikersidentificatie</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Gebruikershandleiding</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Weergave</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Zicht</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Volume:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">W</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Waarschuwing: bijzonder lange duiken kunnen lange berekentijd kosten</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Waarschuwing: het plannen van extreem diepe duiken kan bijzonder veel tijd kosten</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Watertemp.</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Webservice</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Wo</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Gewicht</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Gewichtssysteem</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Gewicht:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">XML bestand</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Jaar</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Jaarlijkse statistieken</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">U heeft al een duikcomputer van dit model met naam %s
-Subsurface kan een bijnaam  voor dit apparaat gebruiken zodat het onderscheiden kan worden van de reeds bestaande. De standaardnaam is het model en het apparaat ID zoals hieronder getoond.
-Als u geen bijnaam voor deze duikcomputer wilt gebruiken, klik dan op &quot;Annuleren&quot; en Subsurface zal dan het model als de naam gebruiken (wat kan betekenen dat u de twee duikcomputers niet van elkaar kunt onderscheiden in het logboek).</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">U heeft onopgeslagen wijzigingen.
-Wilt u deze opslaan voordat u het databestand afsluit?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">U heeft onopgeslagen wijzigingen in bestand: %s 
-Wilt u deze opslaan voordat u het databestand afsluit?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">lucht</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">resterende luchttijd</translation>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">hoogte</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">enkel</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">opstijging</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">backplate-gewicht</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">riem</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">boot</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">bladwijzer</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">grot</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">spelonk</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">plafond</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">plafond (veiligheidsstop)</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">clip-on</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">cuft</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">gegevens</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">decompressie</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">decompressiestop</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">diep</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">diepe stop</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">Duiklog gegeven ID</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">Duiklocatie data ID</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">duiktijd</translation>
-    </message>
-    <message>
-        <source>drift</source>
-        <translation type="obsolete">drift</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">droogpak</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">EAN</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">voor alle duiken</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">Voor duik nr. %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">voor duik nr.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">voor de geselecteerde duik</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">voor de geselecteerde duiken</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">zoetwater</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">ft</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">tweedelig pak</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">gaswissel</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">koers</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">ijs</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">Geïntegreerd</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">Ongeldig</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">ongeldig event-nummer</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">jack</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">meer</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">US pond</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">long john</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">max. pp02</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">max. CNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">Max. diepte</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">membraan droogpak</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">min</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">meer data voor duik ID</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">meer dan %d dagen</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">nacht</translation>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">nultijd</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">geen</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">pHe grenswaarde</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">pN%s grenswaarde</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">pO%s grenswaarde</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">Pa</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">foto</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">zwembad</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">RBT</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">RGBM</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">rivier</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">veiligheidsstop</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">veiligheidsstop (verplicht)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">veiligheidsstop (vrijwillig)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">semidroog</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">kust</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">shorty</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">oppervlakte</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">lesgeven</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">waarschuwing stikstofbelasting</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">training</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">Jacco van Koll
-Reinout Hoornweg</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">zender</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">onbek</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">onbekend</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">Niet gespecificeerd</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">vest</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">video</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">schending</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">Gewicht</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">natpak</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">werklast</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">wrak</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_NL" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialoog</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestand Importeren (CSV)</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Scheiding tussen velden</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Veld Configuratie</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Tijd</translation>
+        <translation>Tijd</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Diepte</translation>
+        <translation>Diepte</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Temperatuur</translation>
+        <translation>Temperatuur</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation>Po2</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation>Cns</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation>Stop diepte</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation>Vooraf ingestelde import</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation>CSV logboek openen</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation>CSV Bestanden (*.csv)</translation>
     </message>
 </context>
 <context>
@@ -2391,57 +77,57 @@ Reinout Hoornweg</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Type</translation>
+        <translation>Type</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Grootte</translation>
+        <translation>Grootte</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Werkdruk</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Startdruk</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Einddruk</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation>O2%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation>He</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation>Wissel op</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik hier om de fles te verwijderen.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation>Fles kan niet verwijderd worden</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dit gas wordt gebruikt. Enkel flessen die niet gebruikt worden kunnen verwijderd worden.</translation>
     </message>
 </context>
 <context>
@@ -2449,41 +135,42 @@ Reinout Hoornweg</translation>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Bewerk duikcomputer apparaatnamen</translation>
+        <translation>Bewerk duikcomputer apparaatnamen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation>Geselecteerde duikcomputer verwijderen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation>Bent u zeker dat u de geselecteerde
+duikcomputer wilt verwijderen?</translation>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Model</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Model</translation>
+        <source>Device ID</source>
+        <translation>Toestel ID</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Apparaatnaam</translation>
+        <translation>Apparaatnaam</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik hier om deze duikcomputer te verwijderen.</translation>
     </message>
 </context>
 <context>
@@ -2491,12 +178,12 @@ Reinout Hoornweg</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation>l/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation>cuft/min</translation>
     </message>
 </context>
 <context>
@@ -2504,95 +191,87 @@ Reinout Hoornweg</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoekvak Tonen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation>alles uitklappen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation>alles inklappen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation>andere samenklappen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation>duik(en) uit trip verwijderen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation>nieuwe duik aanmaken hierboven</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation>duik(en) toevoegen direct hierboven</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation>trip samenvoegen met trip hierboven</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation>trip samenvoegen met trip hieronder</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>duik(en) verwijderen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation>bewaren Als</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation>Als UDDF exporteren</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation>tijdstippen verschuiven</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation>Duiken Bewaren Als</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestand Bewaren als</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Trip met bovenstaande samenvoegen</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Trip met onderstaande samenvoegen</translation>
+        <translation>UDDF bestanden (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation>geselecteerde duiken samenvoegen</translation>
     </message>
 </context>
 <context>
@@ -2600,48 +279,48 @@ Reinout Hoornweg</translation>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulier</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation>Gasverbruik (bodem)</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Gasverbruik tijdens decostop</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation>Laatste stop op 6m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Starttijd</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Druk (atm)</translation>
     </message>
 </context>
 <context>
@@ -2649,23 +328,24 @@ Reinout Hoornweg</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation>10m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation>30ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Een of meer stops zullen verloren gaan.
+Verwijder deze eerst.</translation>
     </message>
 </context>
 <context>
@@ -2673,37 +353,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">AIR</translation>
+        <translation>AIR</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Eind diepte</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Duur</translation>
+        <translation>Duur</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbruikt Gas</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation>CC Set Point</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation>Plan verwijderen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation>U staat op het punt het plan te verwijderen</translation>
     </message>
 </context>
 <context>
@@ -2711,17 +391,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation>Duikplanner punten</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschikbare Gassen</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation>duik punt toevoegen</translation>
     </message>
 </context>
 <context>
@@ -2729,67 +409,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">Nr.</translation>
+        <translation>Nr.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">min</translation>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">US pond</translation>
+        <translation>US pond</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Pak</translation>
+        <translation>Pak</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Fles</translation>
+        <translation>Fles</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">Gasverbruik</translation>
+        <translation>Gasverbruik</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">max. CNS</translation>
+        <translation>max. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Locatie</translation>
+        <translation>Locatie</translation>
     </message>
 </context>
 <context>
@@ -2798,17 +478,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Fout</translation>
+        <translation>Fout</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Opnieuw</translation>
+        <translation>Opnieuw</translation>
     </message>
 </context>
 <context>
@@ -2816,47 +496,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Download uit duikcomputer</translation>
+        <translation>Download uit duikcomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation>Merk</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Duikcomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation>Toestel of Aankoppelpunt</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Forceer download van alle duiken</translation>
+        <translation>Forceer download van alle duiken</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation>Altijd gedownloade duiken gebruiken</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Annuleren</translation>
     </message>
 </context>
 <context>
@@ -2864,225 +544,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation>TabWidget</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Duiknotities</translation>
+        <translation>Duiknotities</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation>Starttijd</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation>lucht / water temperatuur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Locatie</translation>
+        <translation>Locatie</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation>Coördinaten</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Duikleider</translation>
+        <translation>Duikleider</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Buddy</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation>Trefwoorden</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Waardering</translation>
+        <translation>Waardering</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Zicht</translation>
+        <translation>Zicht</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Pak</translation>
+        <translation>Pak</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Notities</translation>
+        <translation>Notities</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Uitrusting</translation>
+        <translation>Uitrusting</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Duikinformatie</translation>
+        <translation>Duikinformatie</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation>Interval</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Gebruikte gassen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation>Gasverbruik</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">Gasverbruik</translation>
+        <translation>Gasverbruik</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Max. Diepte</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Gem. Diepte</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Luchtdruk</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Luchttemperatuur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Watertemperatuur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Duiktijd</translation>
+        <translation>Duiktijd</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoutgehalte</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Statistieken</translation>
+        <translation>Statistieken</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Diepte</translation>
+        <translation>Diepte</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatuur</translation>
+        <translation>Temperatuur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Duur</translation>
+        <translation>Duur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Totale tijd</translation>
+        <translation>Totale tijd</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Duiken</translation>
+        <translation>Duiken</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Flessen</translation>
+        <translation>Flessen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Fles toevoegen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation>Gewichten</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation>Gewichtssysteem toevoegen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Trip locatie</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Trip Nota&apos;s</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation>Deze trip wordt bewerkt. Kies Bewaren of Ongedaan maken als u klaar bent.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation>Meerdere duiken worden bewerkt. Kies Bewaren of Ongedaan maken als u klaar bent.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation>Deze duik wordt bewerkt. Kies Bewaren of Ongedaan maken als u klaar bent.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -3091,32 +771,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation>/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">onbekend</translation>
+        <translation>onbekend</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">Z</translation>
+        <translation>Z</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">O</translation>
+        <translation>O</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">W</translation>
+        <translation>W</translation>
     </message>
 </context>
 <context>
@@ -3124,417 +804,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Bestand</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Weergave</translation>
+        <translation>HoofdScherm</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Help</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestand</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Log</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Help</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Importeren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nieuw logboek</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Nieuw</translation>
+        <translation>Nieuw</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Logboek &amp;Openen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Open</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Bewaar</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Opslaan</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Opslaan als...</translation>
+        <translation>Opslaan als...</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Sluiten</translation>
+        <translation>Sluiten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestanden importeren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;UDDF Exporteren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation>Afdrukken</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+,</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>Afsluiten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Importeren uit &amp;duikcomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;GPS gegevens importeren van Subsurface Service</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation>Namen toestellen wijzigen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl++</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation>Hernummeren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoom in-/uitschakelen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation>Jaarlijkse Statistieken</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation>Duiklijst</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Profiel</translation>
+        <translation>Profiel</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Informatie</translation>
+        <translation>Informatie</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>Handleiding</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation>Wereldbol</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation>Duik P&amp;lannen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation>CSV importeren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation>CS&amp;V importeren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation>Importeren van Divelogs.de</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Instellingen</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Afsluiten</translation>
+        <translation>Instellingen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Apparaatnamen bewerken</translation>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Hernummeren</translation>
+        <translation>Duik Toevoegen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zoom in-/uitschakelen</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Jaarlijkse statistieken</translation>
+        <translation>Automatisch Groeperen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+2</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+3</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+4</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Vorige DC</translation>
+        <translation>Vorige DC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Links</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Volgende DC</translation>
+        <translation>Volgende DC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechts</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">gebeurtenissen selecteren</translation>
+        <translation>gebeurtenissen selecteren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Voer plan in</translation>
+        <translation>Voer plan in</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Over Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Gebruikershandleiding</translation>
+        <translation>Over Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation>F1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+5</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Bestand openen</translation>
+        <translation>Bestand openen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation>De handleiding kan niet gevonden worden</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wilt u de wijzigingen in bestand %1 bewaren?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wilt u de wijzigingen bijhouden in het bestand?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Aanpassingen opslaan?</translation>
+        <translation>Aanpassingen opslaan?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wijzigingen gaan verloren als u deze niet bewaart.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestand Bewaren als</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3544,17 +1184,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Waarschuwing</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation>UDDF bestanden (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -3562,289 +1202,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialoog</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Standaardinstellingen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Eenheden</translation>
+        <translation>Eenheden</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation>Grafiek</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation>Lijsten en Tabellen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Lettertype</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation>Lettertype grootte</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Duiken</translation>
+        <translation>Duiken</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation>Standaard Duikbestand</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>Ongeldig Scherm</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Standaard fles</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Gebruik standaard fles</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation>Systeem</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation>Metrisch</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation>Imperiaal</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation>Personaliseren</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Diepte</translation>
+        <translation>Diepte</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">meter</translation>
+        <translation>meter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">voet</translation>
+        <translation>voet</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Druk</translation>
+        <translation>Druk</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation>Psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Volume</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">liter</translation>
+        <translation>liter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">cuft</translation>
+        <translation>cuft</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatuur</translation>
+        <translation>Temperatuur</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">celsius</translation>
+        <translation>celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">fahrenheit</translation>
+        <translation>fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Gewicht</translation>
+        <translation>Gewicht</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation>Kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">US pond</translation>
+        <translation>US pond</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation>Tijdseenheden</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation>Stijg-/daalsnelheid noemer</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>Minuten</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Seconden</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation>pO2</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation>drempelwaarde</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation>pN2</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation>pHe</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation>MOD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation>max PP02</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation>EAD END EADD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation>Plafond gerapporteerd door duikcomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation>plafond in het rood tekenen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation>Berekend plafond</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation>alle compartimenten tonen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation>3m stappen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation>NDL/TTS Berekenen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon gasverbruik</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation>GFLow op max diepte</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Allerlei</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation>Standaard Logboek Openen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -3852,7 +1492,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation>Afdrukken</translation>
     </message>
 </context>
 <context>
@@ -3860,37 +1500,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Duik nr.</translation>
+        <translation>Duik nr.</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Diepte</translation>
+        <translation>Diepte</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Duur</translation>
+        <translation>Duur</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Master</translation>
+        <translation>Master</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Buddy</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Locatie</translation>
+        <translation>Locatie</translation>
     </message>
 </context>
 <context>
@@ -3898,84 +1538,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulier</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation>Afdrukopties</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Alleen geselecteerde duiken afdrukken</translation>
+        <translation>Alleen geselecteerde duiken afdrukken</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">Afdrukken in kleur</translation>
+        <translation>Afdrukken in kleur</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Afdruktype</translation>
+        <translation>Afdruktype</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 duiken per bladzijde</translation>
+        <translation>6 duiken per bladzijde</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 duiken per bladzijde</translation>
+        <translation>2 duiken per bladzijde</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Afdrukken in tabelvorm</translation>
+        <translation>Afdrukken in tabelvorm</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished">Volgorde</translation>
+        <translation>Volgorde</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Profiel bovenaan</translation>
+        <translation>Profiel bovenaan</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Notities bovenaan</translation>
+        <translation>Notities bovenaan</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation>Instellen hoogtes (% van opmaak)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Profiel hoogte (43% - 85%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Andere gegevens hoogte (8% - 17%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Nota&apos;s hoogte (0% - 52%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation>0</translation>
     </message>
 </context>
 <context>
@@ -3983,87 +1623,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation>onbekende duikcomputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>Duur instellen: 10 minuten</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation>Schaal</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation>Meetlat</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation>Eigenschappen van duiksegmenten berekenen</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation>Duik aan schermgrootte aanpassen</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Bewerken</translation>
+        <translation>Bewerken</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">lucht</translation>
+        <translation>lucht</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation>EAN%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Schakel om naar OC</translation>
+        <translation>Schakel om naar OC</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> begin</translation>
+        <translation> begin</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> eind</translation>
+        <translation> eind</translation>
     </message>
 </context>
 <context>
@@ -4071,62 +1711,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">onbekend</translation>
+        <translation>onbekend</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Duik #%1 - %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Max diepte: %1 %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation>Duur: %1 min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Fles</translation>
+        <translation>Fles</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Gasmengsel</translation>
+        <translation>Gasmengsel</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Gas gebruikt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">Gasverbruik</translation>
+        <translation>Gasverbruik</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Max. CNS</translation>
+        <translation>Max. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation>Gewichten</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation>Totaal gewicht</translation>
     </message>
 </context>
 <context>
@@ -4134,50 +1774,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">AIR</translation>
+        <translation>AIR</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation>Dit punt verwijderen</translation>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation>Geen locatiegegevens - verplaats de kaart en dubbelklik om een duiklocatie te kiezen</translation>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation>Duik bewerken - verplaats de kaart en dubbelklik om de duiklocatie te selecteren</translation>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Sluiten</translation>
+        <translation>Sluiten</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Gemiddelde</translation>
+        <translation>Gemiddelde</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished">Kleinste</translation>
+        <translation>Kleinste</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished">Grootste</translation>
+        <translation>Grootste</translation>
     </message>
 </context>
 <context>
@@ -4185,12 +1817,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Hernummeren</translation>
+        <translation>Hernummeren</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Nieuw beginnummer</translation>
+        <translation>Nieuw beginnummer</translation>
     </message>
 </context>
 <context>
@@ -4198,27 +1830,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation>Geselecteerde tijdsstippen verschuiven</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation>Geselecteerde tijdsstippen verschuiven met</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation>u:mm</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation>vroeger</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation>later</translation>
     </message>
 </context>
 <context>
@@ -4226,27 +1858,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Over Subsurface</translation>
+        <translation>Over Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekstlabel</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Licentie</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Website</translation>
     </message>
 </context>
 <context>
@@ -4254,37 +1886,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Webservice</translation>
+        <translation>Webservice</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation>Even geduld...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation>Download beëindigd</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Verbindingsfout:</translation>
+        <translation>Verbindingsfout:</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Ongeldige gebruikersidentificatie</translation>
+        <translation>Ongeldige gebruikersidentificatie</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Kan antwoord niet parsen!</translation>
+        <translation>Kan antwoord niet parsen!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Laden succesvol voltooid!</translation>
+        <translation>Laden succesvol voltooid!</translation>
     </message>
 </context>
 <context>
@@ -4292,30 +1924,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulier</translation>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Fles toevoegen</translation>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <source>Description</source>
+        <translation>Beschrijving</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation>Ml</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
@@ -4323,20 +1955,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informatie</translation>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation>Beschrijving</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -4344,37 +1976,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Locatie gegevens downloaden</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation>Status:</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation>Geef uw ID in</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Downloaden</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Gebruikers ID</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Wachtwoord</translation>
+        <translation>Wachtwoord</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation>Uploaden</translation>
     </message>
 </context>
 <context>
@@ -4382,17 +2014,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Type</translation>
+        <translation>Type</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Gewicht</translation>
+        <translation>Gewicht</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klikken om het gewichtssysteem te verwijderen</translation>
     </message>
 </context>
 <context>
@@ -4401,42 +2033,48 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation>Jaar
+ &gt; Maand / Trip</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">Nr.</translation>
+        <translation>Nr.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation>Duur
+ Totaal</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Gemiddeld</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Kortste</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Langste</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Diepte (%1)
+ Gemiddeld</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4444,7 +2082,8 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Minimum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4452,19 +2091,22 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Maximum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Gasverbruik (%1)
+ Gemiddeld</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Temp. (%1)
+ Gemiddeld</translation>
     </message>
 </context>
 <context>
@@ -4472,64 +2114,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">Pa</translation>
+        <translation>Pa</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">cuft</translation>
+        <translation>cuft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">US pond</translation>
+        <translation>US pond</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) of (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s %3$d %2$s %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) of (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4539,32 +2177,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">lucht</translation>
+        <translation>lucht</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">Geïntegreerd</translation>
+        <translation>Geïntegreerd</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">riem</translation>
+        <translation>riem</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">enkel</translation>
+        <translation>enkel</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">backplate-gewicht</translation>
+        <translation>backplate-gewicht</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">clip-on</translation>
+        <translation>clip-on</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4574,314 +2212,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Fout bij lezen van &apos;%s&apos;</translation>
+        <translation>Fout bij lezen van &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%s&apos; lezen is mislukt. Gebruik Importeren voor CSV bestanden.</translation>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation>Het maximum aantal kolommen bij CSV importeren is %d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">geen</translation>
+        <translation>geen</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">decompressiestop</translation>
+        <translation>decompressiestop</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">RBT</translation>
+        <translation>RBT</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">opstijging</translation>
+        <translation>opstijging</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">plafond</translation>
+        <translation>plafond</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">werklast</translation>
+        <translation>werklast</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">zender</translation>
+        <translation>zender</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">schending</translation>
+        <translation>schending</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">bladwijzer</translation>
+        <translation>bladwijzer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">oppervlakte</translation>
+        <translation>oppervlakte</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">veiligheidsstop</translation>
+        <translation>veiligheidsstop</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">gaswissel</translation>
+        <translation>gaswissel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">veiligheidsstop (vrijwillig)</translation>
+        <translation>veiligheidsstop (vrijwillig)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">veiligheidsstop (verplicht)</translation>
+        <translation>veiligheidsstop (verplicht)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">diepe stop</translation>
+        <translation>diepe stop</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">plafond (veiligheidsstop)</translation>
+        <translation>plafond (veiligheidsstop)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation>onder de vloer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">duiktijd</translation>
+        <translation>duiktijd</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">Max. diepte</translation>
+        <translation>Max. diepte</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">OLF</translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">resterende luchttijd</translation>
+        <translation>resterende luchttijd</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">RGBM</translation>
+        <translation>RGBM</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">koers</translation>
+        <translation>koers</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">waarschuwing stikstofbelasting</translation>
+        <translation>waarschuwing stikstofbelasting</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">nultijd</translation>
+        <translation>nultijd</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">ongeldig event-nummer</translation>
+        <translation>ongeldig event-nummer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Kan geen parser creëren voor %s %s</translation>
+        <translation>Kan geen parser creëren voor %s %s</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Fout bij het registreren van de data</translation>
+        <translation>Fout bij het registreren van de data</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Fout bij verwerken van de datum en tijd</translation>
+        <translation>Fout bij verwerken van de datum en tijd</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Duik nr. %d: %s %d %04d</translation>
+        <translation>Duik nr. %d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Fout bij verwerken van de duikduur</translation>
+        <translation>Fout bij verwerken van de duikduur</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Fout bij het verwerken van de maximum duikdiepte</translation>
+        <translation>Fout bij het verwerken van de maximum duikdiepte</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Fout bij het verwerken van het aantal gasmengsels</translation>
+        <translation>Fout bij het verwerken van het aantal gasmengsels</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Fout bij het verkrijgen van het zoutgehalte</translation>
+        <translation>Fout bij het verkrijgen van het zoutgehalte</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Fout bij bekomen van oppervlaktedruk</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Fout bij het verwerken van het gasmengsel</translation>
+        <translation>Fout bij het verwerken van het gasmengsel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Fout bij het verwerken van de samples</translation>
+        <translation>Fout bij het verwerken van de samples</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Event: wachten op handeling van gebruiker</translation>
+        <translation>Event: wachten op handeling van gebruiker</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x)</translation>
+        <translation>model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Fout bij het registreren van de event handler.</translation>
+        <translation>Fout bij het registreren van de event handler.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Fout bij het registreren van de cancellation handler.</translation>
+        <translation>Fout bij het registreren van de cancellation handler.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Fout bij importeren van duikdata</translation>
+        <translation>Fout bij importeren van duikdata</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">Kan geen context creëren voor libdivecomputer</translation>
+        <translation>Kan geen context creëren voor libdivecomputer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Fout bij openen van  %s %s (%s)</translation>
+        <translation>Fout bij openen van  %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Vreemde percentage %s
+        <translation>Vreemde percentage %s
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Fout bij analyseren van &apos;%s&apos;.
+        <translation>Fout bij analyseren van &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Fout bij analyse van &apos;%s&apos;</translation>
+        <translation>Fout bij analyse van &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished">Database-query get_events mislukt.
+        <translation>Database-query get_events mislukt.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished">Databaseconnectie is mislukt &apos;%s&apos;.
+        <translation>Databaseconnectie is mislukt &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished">Database-query mislukt: &apos;%s&apos;
+        <translation>Database-query mislukt: &apos;%s&apos;
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">Kan stylesheet (%s)/%s niet openen</translation>
+        <translation>Kan stylesheet (%s)/%s niet openen</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Kan gasmengsel %d/%d niet vinden</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Fles voor planning</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Gesimuleerde duik</translation>
+        <translation>Kan gasmengsel %d/%d niet vinden</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">Teveel gasmengsels</translation>
+        <translation>Teveel gasmengsels</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4890,7 +2520,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Subsurface duikplan
 Gebaseerd op GFlow =  %.0f en GFhigh = %.0f
 
@@ -4900,166 +2530,163 @@ Gebaseerd op GFlow =  %.0f en GFhigh = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Ga naar %.*f %s over %d:%02d min - looptijd %d:%02u op %s
+        <translation>Ga naar %.*f %s over %d:%02d min - looptijd %d:%02u op %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Blijft op %.*f %s gedurende %d:%02d min - looptijd %d:%02u op %s
+        <translation>Blijft op %.*f %s gedurende %d:%02d min - looptijd %d:%02u op %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Gaswissel naar %s
+        <translation>Gaswissel naar %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Gasverbruik:
+        <translation>Gasverbruik:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s %s
+        <translation>%.0f%s %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">EAN</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
+        <translation>EAN</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 P:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Berekend plafond %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Compartiment %.0fmin: %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Veiligheidsstop:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Veiligheidsstop:onbek.tijd @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deco:onbek.tijd @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 In deco</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
@@ -5068,7 +2695,7 @@ MOD:%d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 EAD:%d%s
 END:%d%s
 EADD:%d%s</translation>
@@ -5077,352 +2704,340 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Deco:%umin @ %.0f %s (berekend)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+In deco (berekend)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+NDL:%umin (berekend)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+TTS:%umin (berekend)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation>C</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation>F</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2 (%3 duiken)</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">Ongeldig</translation>
+        <translation>%1 %2 (1 duik)</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">boot</translation>
+        <translation>boot</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">kust</translation>
+        <translation>kust</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished">drift</translation>
+        <translation>drift</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">diep</translation>
+        <translation>diep</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">spelonk</translation>
+        <translation>spelonk</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">ijs</translation>
+        <translation>ijs</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">wrak</translation>
+        <translation>wrak</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">grot</translation>
+        <translation>grot</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">hoogte</translation>
+        <translation>hoogte</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">zwembad</translation>
+        <translation>zwembad</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">meer</translation>
+        <translation>meer</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">rivier</translation>
+        <translation>rivier</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">nacht</translation>
+        <translation>nacht</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation>zoet</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">zoetwater</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">training</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">lesgeven</translation>
+        <translation>student</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">foto</translation>
+        <translation>foto</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">video</translation>
+        <translation>video</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation>instructeur</translation>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">decompressie</translation>
+        <translation>decompressie</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">meer dan %d dagen</translation>
+        <translation>meer dan %d dagen</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dd %du %dmin</translation>
+        <translation>%dd %du %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%du %dmin</translation>
+        <translation>%du %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">voor duik nr.</translation>
+        <translation>voor duik nr.</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">voor de geselecteerde duiken</translation>
+        <translation>voor de geselecteerde duiken</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">Voor duik nr. %d</translation>
+        <translation>Voor duik nr. %d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">voor de geselecteerde duik</translation>
+        <translation>voor de geselecteerde duik</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">voor alle duiken</translation>
+        <translation>voor alle duiken</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(geen duiken)</translation>
+        <translation>(geen duiken)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">Zo</translation>
+        <translation>Zo</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">Ma</translation>
+        <translation>Ma</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">Di</translation>
+        <translation>Di</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">Wo</translation>
+        <translation>Wo</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">Do</translation>
+        <translation>Do</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">Vr</translation>
+        <translation>Vr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">Za</translation>
+        <translation>Za</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">jan</translation>
+        <translation>jan</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">feb</translation>
+        <translation>feb</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">mar</translation>
+        <translation>mar</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">apr</translation>
+        <translation>apr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">mei</translation>
+        <translation>mei</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">jun</translation>
+        <translation>jun</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">jul</translation>
+        <translation>jul</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">aug</translation>
+        <translation>aug</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">sept</translation>
+        <translation>sept</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">okt</translation>
+        <translation>okt</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">nov</translation>
+        <translation>nov</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">dec</translation>
+        <translation>dec</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zurich: Bestandssysteem bijna vol
+        <translation>Uemis Zurich: Bestandssysteem bijna vol
 AUB de duikcomputer loskoppelen en weer aansluiten
 en klik op &apos;Opnieuw&apos;</translation>
     </message>
@@ -5431,7 +3046,7 @@ en klik op &apos;Opnieuw&apos;</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zurich: Bestandssysteem vol
+        <translation>Uemis Zurich: Bestandssysteem vol
 AUB de duikcomputer loskoppellen en weer aansluiten
 en probeer opnieuw</translation>
     </message>
@@ -5439,193 +3054,193 @@ en probeer opnieuw</translation>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Gedeeltelijke schrijfvoortgang naar req.txt bestand
+        <translation>Gedeeltelijke schrijfvoortgang naar req.txt bestand
 Is de Uemis Zurich correkt aangesloten?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">onbekend</translation>
+        <translation>onbekend</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Lezen %s %s</translation>
+        <translation>Lezen %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">gegevens</translation>
+        <translation>gegevens</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">Duiklog gegeven ID</translation>
+        <translation>Duiklog gegeven ID</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">Duiklocatie data ID</translation>
+        <translation>Duiklocatie data ID</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">meer data voor duik ID</translation>
+        <translation>meer data voor duik ID</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">natpak</translation>
+        <translation>natpak</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">semidroog</translation>
+        <translation>semidroog</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">droogpak</translation>
+        <translation>droogpak</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">shorty</translation>
+        <translation>shorty</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">vest</translation>
+        <translation>vest</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">long john</translation>
+        <translation>long john</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">jack</translation>
+        <translation>jack</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">tweedelig pak</translation>
+        <translation>tweedelig pak</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">2-delig pak</translation>
+        <translation>2-delig pak</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">membraan droogpak</translation>
+        <translation>membraan droogpak</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Initialiseer communicatie</translation>
+        <translation>Initialiseer communicatie</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Uemis niet geïnitialiseerd</translation>
+        <translation>Uemis niet geïnitialiseerd</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Begin download</translation>
+        <translation>Begin download</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">veiligheidsstop overtreding</translation>
+        <translation>veiligheidsstop overtreding</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Alarm: snelheid</translation>
+        <translation>Alarm: snelheid</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Waarschuwing: snelheid</translation>
+        <translation>Waarschuwing: snelheid</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Waarschuwing: PO2 Groen</translation>
+        <translation>Waarschuwing: PO2 Groen</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Waarschuwing: Opstijging / PO2</translation>
+        <translation>Waarschuwing: Opstijging / PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Alarm: Opstijging / PO2</translation>
+        <translation>Alarm: Opstijging / PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Info: Flesdruk</translation>
+        <translation>Info: Flesdruk</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Waarschuwing: resterende gas-tijd</translation>
+        <translation>Waarschuwing: resterende gas-tijd</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Alarm: resterende gas-tijd</translation>
+        <translation>Alarm: resterende gas-tijd</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Fleswissel voorgesteld</translation>
+        <translation>Fleswissel voorgesteld</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Dieptelimiet overschreden</translation>
+        <translation>Dieptelimiet overschreden</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Waarschuwing: Maximale deco-tijd</translation>
+        <translation>Waarschuwing: Maximale deco-tijd</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Info: Duiktijd</translation>
+        <translation>Info: Duiktijd</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Alarm: Duiktijd</translation>
+        <translation>Alarm: Duiktijd</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Markering</translation>
+        <translation>Markering</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Geen flesinformatie</translation>
+        <translation>Geen flesinformatie</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Waarschuwing:Lege batterij</translation>
+        <translation>Waarschuwing:Lege batterij</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Alarm: Lege batterij</translation>
+        <translation>Alarm: Lege batterij</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index 007b52b68..80c0366e7 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -1,2390 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-brak zdarzeń
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete"> &gt; miesiąc</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete">Pobierz</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete">Proszę wybrać komputer nurkowy i urządzenie</translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> początek</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> koniec</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">#</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s z %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dd %dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-Obliczony sufit %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deco:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deco:nieznany czas @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-dekompresja</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL:%umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-P:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Przyst. bezp.:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Przyst. bezp.:nieznany czas @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Subsurface - Plan Nurkownia
-w oparciu o GFlow = %.0f oraz GFhigh = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s event at %d:%02u</source>
-        <translation type="obsolete">%s w %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s: Response from divelogs.de</source>
-        <translation type="obsolete">%s: odpowiedź z divelogs.de</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) lub (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(kliknij by edytować datę/czas)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(kliknij by edytować datę/czas/głębokość)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(brak nurkowań)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(nic)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 cuft/min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 cuft/min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 l/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 nurkowania na stronę</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">pełna dwuczęściowa</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 l/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">Pokazuj sufit z krokiem co 3m</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 nurkowań na stronę</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;Add segments below.
-Each line describes part of the planned dive.
-An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. &apos;+3:30&apos;) or ends at the given time (if absolute e.g &apos;@5:00&apos;, &apos;runtime&apos;), and uses the given gas.
-An empty gas means &apos;use previous gas&apos; (or AIR if no gas was specified).
-An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.
-CC SetPoint specifies CC (rebreather) dives, leave empty for OC.&lt;/small&gt;
-</source>
-        <translation type="obsolete">&lt;small&gt;Dodaj segmenty nurkowania poniżej.
-Każda linia opisuje fragment planowanego nurkowania.
-Wpis z podaniem głębokości, czasu i rodzaju gazu oznacza fragment nurkowania kończący się na danej głębokości, trwający dany czas (gdy czas podano względem poprzedniego, np.&apos;+3:30&apos;) lub kończący o podanym czasie (gdy podano czas bezwzględny, np.&apos;@5:00&apos;) i z użyciem podanego gazu. 
-Jeśli nie podasz rodzaju gazu dla danego segmentu oznacza to użycie tego samego rodzaju gazu, co w poprzednim segmencie (jeśli w ogóle nie określisz gazu, domyślnie przyjmowane jest powietrze).
-Wpis z podaniem głębokości i rodzaju gazu ale bez podania czasu ma specjalne znaczenie; informuje to Planer, że dany gaz jest dostępny podczas wynurzania po osiągnięciu danej głębokości. 
-CC SetPoint dotyczy nurkowań na obiegu zamkniętym (rebreather) - pole należy pozostawić puste dla nurkowania na obiegu otwartym&lt;/small&gt; 
-</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">POWIETRZE</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">O Subsurface</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Dodaj</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Dodaj nurkowanie...</translation>
-    </message>
-    <message>
-        <source>Add bookmark event here</source>
-        <translation type="obsolete">Dodaj zakładkę</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Dodaj nurkowanie</translation>
-    </message>
-    <message>
-        <source>Add gas change event here</source>
-        <translation type="obsolete">Dodaj zmianę gazu</translation>
-    </message>
-    <message>
-        <source>Add gaschange event at %d:%02u</source>
-        <translation type="obsolete">Dodaj zmianę gazu w %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Dodaj do grupy powyżej</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Dodaj punkt</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Ciśnienie atm.</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Temp. powietrza</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Temperatura powietrza w %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Preferuj pobierane nurkowania</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">Kwi</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">Sie</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Automatyczne grupowanie</translation>
-    </message>
-    <message>
-        <source>Available gases</source>
-        <translation type="obsolete">Dostępne gazy</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">średnia</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">średni</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">średni</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">średnia</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Śr. głębokość </translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Śr. głębokość  (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">Śr. SAC</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Śr. temp.</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Średni czas</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Przejście na obieg otwarty</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">Bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Partner</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CC SetPoint</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Nie znaleziono gazu %d/%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">Nie można otworzyć arkusza stylów (%s)/%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Anulowano</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Anulowano...</translation>
-    </message>
-    <message>
-        <source>Cannot add gas change</source>
-        <translation type="obsolete">Nie można dodać zmiany gazu</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Nie można przetworzyć odpowiedzi!</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Celsjusz</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Wybierz domyślmy plik XML</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Wybierz plik XML, z którego zaimportować dane</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Zamknij</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Zwiń wszystkie</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Łączenie...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Błąd połączenia:</translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Utwórz nową grupę powyżej</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">cuft</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Butle</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Butla</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">butle do zaplanowania</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Butle</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">Gł:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">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>
-        <source>Database connection failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Błąd połączenia z bazą danych &apos;%s&apos;.⏎
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Błąd komunikacji z bazą danych &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query get_events failed.
-</source>
-        <translation type="obsolete">Zapytanie bazy danych  get_events nie powiodło się.⏎
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Data i czas</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Data:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">Gru</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">Domyślny plik XML</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Usuń informacje o komputerze nurkowym</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Usuń nurkowanie</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Usuń nurkowania</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Głębokość</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Przekroczenie limitu głębokości</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Głębokość:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Id urządzenia</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Urządzenie lub punkt montowania</translation>
-    </message>
-    <message>
-        <source>Display invalid dives</source>
-        <translation type="obsolete">Wyświetlaj niepoprawne nurkowania</translation>
-    </message>
-    <message>
-        <source>Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</source>
-        <extracomment>++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-&lt;trailing text&gt;
-</extracomment>
-        <translation type="obsolete">Nurkowanie #%1$d - %2$s %3$02d/%4$02d/%5$04d o %6$d:%7$02d %8$s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Nurkowanie nr %d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Nurkowanie %d: %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Nazwa komputera nurkowego</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Informacje</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Notatki</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Plan nurkowania - SYMULACJA; NIE UŻYWAĆ DO  NURKOWANIA.</translation>
-    </message>
-    <message>
-        <source>Dive Tags</source>
-        <translation type="obsolete">Etykiety</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Czas nurkowania</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Alarm: czas nurkowania</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Informacja: czas nurkowania</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Producent i model komputera nurkowego</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Błąd podczas importowania danych</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Miejsca nurkowe</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Divemaster</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Początek nurkowania za:</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Nurkowanie nr</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Czcionka listy nurkowań</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Divemaster</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Nurkowania</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Miejsca nurkowe</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Pobierz z komputera nurkowego</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Pobierz z komputera nurkowego</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Pobierz z Web Service</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Pobierz z Web Service</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Pobieranie zakończone sukcesem!</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Czas</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Czas trwania(min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">E</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Edytuj</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Edycja nazw komputerów nurkowych</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Edycja nazw komputerów nurkowych</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Edytuj informacje o grupie</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Edytuj podsumowanie grupy nurkowań</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Aby edytować nazwę komputera nurkowego kliknij dwukrotnie odpowiednie pole z nazwą</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Edytuj nurkowanie</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Edytuj datę/czas nurkowania</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Edycja wielu nurkowań</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Edycja wielu nurkowań</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Edytuj podsumowanie grupy nurkowań</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Pokazuj zdarzenia:</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Tags</source>
-        <translation type="obsolete">Wybór etykiet</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Koniec</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Głębokość końcowa</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Podaj identyfikator użytkownika i wybierz &apos;Pobierz&apos;. Po zakończeniu pobierania możesz wybrać &apos;Zastosuj&apos; w celu zastosowania zmian.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Wyposażenie</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Błąd</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Błąd podczas przetwarzania danych o zasoleniu</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Błąd podczas przetwarzania daty i czasu</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Błąd podczas przetwarzania czasu nurkowania</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Błąd podczas przetwarzania danych o użytym rodzaju gazu</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Błąd podczas przetwarzania danych o ilości użytych rodzajów gazu</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Błąd podczas przetwarzania głębokości</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Błąd podczas przetwarzania próbek</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Błąd rejestracji uchwytu (cancellation handler)</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Błąd podczas przetwarzania danych</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Błąd rejestracji uchwytu (event handler)</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Event: systime=%&lt;PRId64&gt;, devtime=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Oczekiwanie na działanie użytkownika</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Rozwiń wszystkie</translation>
-    </message>
-    <message>
-        <source>Export As UDDF File</source>
-        <translation type="obsolete">Eksportuj jako plik UDDF</translation>
-    </message>
-    <message>
-        <source>Export UDDF...</source>
-        <translation type="obsolete">Eksportuj UDDF...</translation>
-    </message>
-    <message>
-        <source>Export dive(s) to UDDF</source>
-        <translation type="obsolete">Eksportuj nurkowania do UDDF</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Nie udało się otworzyć %i plików.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Nie udało się przetworzyć &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Nie udało się przetworzyć &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Błąd odczytu &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Błąd odczytu &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">Lut</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">Stopy</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Plik</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filtr</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Wymuś pobranie wszystkich nurkowań</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pią</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFhigh</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFhigh dla planu</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFlow</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFlow dla planu</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (format WGS84 lub GPS)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Użyty gaz</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Zużyty gaz</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Użyty gaz</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Zużycie gazu:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Gaz</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Ogólne</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Pomoc</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">Bezczynny</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Importuj plik(i)...</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Informacje</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Nawiązywanie łączności</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Wprowadź plan</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Niepoprawna głębokość - nie można zinterpretować &quot;%s&quot;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Niepoprawna głębokość - głębokości poniżej 400m nie są obsługiwane</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Niepoprawny gaz w linijce %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Niepoprawny czas początku nurkowania</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Niepoprawny identyfikator użytkownika!</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Sty</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">Lip</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">Cze</translation>
-    </message>
-    <message>
-        <source>Last stop at 20 Feet</source>
-        <translation type="obsolete">Ostatni przystanek na głębokości 20 stóp</translation>
-    </message>
-    <message>
-        <source>Last stop at 6 Meters</source>
-        <translation type="obsolete">Ostatni przystanek na głębokości 6 metrów</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Układ</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel i inni, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Lista</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">Litry</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Miejsce</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">max.</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Najdłuższe nurkowanie</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Alarm: niski poziom baterii</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Ostrzeżenie: niski poziom baterii</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Źródło map</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Mark invalid</source>
-        <translation type="obsolete">Oznacz jak nieprawidłowe</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Zaznacz położenie</translation>
-    </message>
-    <message>
-        <source>Mark valid</source>
-        <translation type="obsolete">Oznacz jak prawidłowe</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Znacznik</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Divemaster</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Ostrzeżenie: maksymalny czas dekompresji</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Max głębokość </translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Max głębokość  (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Max SAC</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Max temp.</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Max głębokość : %.*f %s
-Czas: %d min
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Max. CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Ciśnienie max</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">max.</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">max.</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">max.</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">Maj</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Połącz nurkowania</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Połącz grupę z grupą powyżej</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Połącz grupę z grupą poniżej</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">Metry</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Min głębokość </translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Min SAC</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Min temp.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">min.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">min.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">min.</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Różne</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Model</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Pon</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Wieloplatformowy log nurkowy napisany w C</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nowy</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Nowy numer początkowy</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Następny komputer</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Nazwa</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Brak danych o butli</translation>
-    </message>
-    <message>
-        <source>No cylinders listed for this dive.</source>
-        <translation type="obsolete">Nie podano butli dla tego nurkowania.</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notatki</translation>
-    </message>
-    <message>
-        <source>Notes height (%d%% - %d%%)</source>
-        <translation type="obsolete">wysokość notatek (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Notatki na górze</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">Lis</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">Ekspozycja tlenowa</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">Paź</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Błąd pthread</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Na pewno usunąć zaznaczony wpis?</translation>
-    </message>
-    <message>
-        <source>Only display dives with these tags:</source>
-        <translation type="obsolete">Wyświetlaj tylko nurkowania z tymi etykietami:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Otwórz plik</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Otwórz...</translation>
-    </message>
-    <message>
-        <source>Ordering</source>
-        <translation type="obsolete">Kolejność</translation>
-    </message>
-    <message>
-        <source>Other data height (%d%% - %d%%)</source>
-        <translation type="obsolete">wysokość pozostałych danych (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Tlen</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Alarm: wynurzanie / PO2 </translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Ostrzeżenie: wynurzanie / PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Ostrzeżenie: PO2 zielone</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">PSI</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Hasło</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Wskaż na mapie</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Planowanie</translation>
-    </message>
-    <message>
-        <source>Please enter your userid and password for divelogs.de. The selected dives will be added to your account</source>
-        <translation type="obsolete">Proszę podać swoją nazwę użytkownika i hasło dla divelogs.de. Zaznaczone nurkowania zostaną dodane do Twojego konta. </translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Ustawienia</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Ustawienia...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Ciśnienie</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Ciśnienie:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Poprzedni komputer</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">Drukuj w kolorze</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Drukuj tylko zaznaczone nurkowania</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Wybór danych do druku</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Rodzaj wydruku</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Drukuj...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Profil</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Konfiguracja profilu</translation>
-    </message>
-    <message>
-        <source>Profile height (%d%% - %d%%)</source>
-        <translation type="obsolete">wysokość profilu (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Profil na górze</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Wyjście</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Alarm: ilość gazu</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Ostrzeżenie: ilość gazu</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Ocena</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Czytanie %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Usuń</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Usuń grupę</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Usuń nurkowanie z grupy</translation>
-    </message>
-    <message>
-        <source>Remove event here</source>
-        <translation type="obsolete">Usuń to wydarzenie</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Usuń wybrane nurkowania z grupy</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Zmień numerację</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Zmień numerację...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Ponów</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">SAC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">SAC podczas dekompresji</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">SAC podczas nurkowania</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Pominięcie przystanku bezpieczeństwa</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sob</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Zapisz jako..</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Zapisać zmiany?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Zapisz jako</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Zapisz jako</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Zapisz...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Czas segmentu</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Wybór zdarzeń</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Wybór zdarzeń...</translation>
-    </message>
-    <message>
-        <source>Select Tags...</source>
-        <translation type="obsolete">Wybór etykiet...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">Wrz</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Nieudany zapis do pliku req.txt 
-Czy Uemis Zurich jest podłączony poprawnie?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">min.</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Najkrótsze nurkowanie</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Pokazuj kolumny</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">pokazuj EAD, END, EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">pokazuj MOD</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Pokazuj obliczony sufit</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Pokazuj sufit z komputera nurkowego na czerwono</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Pokaż na mapie</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">pokazuj wykres pHe</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">pokazuj wykres pN%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">pokazuj wykres pO%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Symulowane nurkowanie</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Pojemność</translation>
-    </message>
-    <message>
-        <source>Sizing heights (%% of layout)</source>
-        <translation type="obsolete">Wysokości (%% strony)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Alarm prędkości wynurzania</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Ostrzeżenie: prędkość wynurzania</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Start</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Rozpocznij pobieranie</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Statystyka</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Statystyka %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Statystyka</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Status</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Podejrzany skład procentowy %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Skafander</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Nie</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Przerwa pow.</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Ciśnienie atmosferyczne (mbar)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Zmiana gazu na %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Tabela</translation>
-    </message>
-    <message>
-        <source>Tags are only shown if they are identical for all edited dives</source>
-        <translation type="obsolete">Etykiety są pokazywane tylko gdy są takie same dla wszystkich edytowanych nurkowań</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Zalecana zmiana gazu</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Ciśnienie w butli</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Ustawienia Tec</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Temperatura</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Temperatura</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Temperatura:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Potrójny</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Czw</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Czas</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Aby edytować informacje o nurkowaniu
-dwukrotnie kliknij na jego wpisie na liście nurkowań</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Skalowanie wykresu</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">Zbyt wiele rodzajów gazu</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">Zbyt wiele punktów</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">całkowity</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Całkowity czas</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Całkowity balast:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Przejście do  %.*f %s w %d:%02d min - runtime %d:%02u z %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Grupa %1$s, %2$s %3$d, %4$d (%5$d nurkowanie)</numerusform>
-            <numerusform>Grupa %1$s, %2$s %3$d, %4$d (%5$d nurkowania)</numerusform>
-            <numerusform>Grupa %1$s, %2$s %3$d, %4$d (%5$d nurkowań)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Wto</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Rodzaj</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zurich: System plików jest prawie pełen
-Odłącz i podłącz ponownie komputer nurkowy 
-i wybierz &apos;Ponów&apos;</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zurich: System plików jest pełen
-Odłącz i podłącz ponownie komputer nurkowy
-i spróbuj jeszcze raz.</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Błąd inicjalizacji Uemis </translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">Nie można utworzyć kontekstu libdivecomputer</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Nie udało się utworzyć parsera dla %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Nie udało się otworzyć %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Jednostki</translation>
-    </message>
-    <message>
-        <source>Upload dive(s) to divelogs.de</source>
-        <translation type="obsolete">Wyślij nurkowania do divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de</source>
-        <translation type="obsolete">Wyślij do divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de...</source>
-        <translation type="obsolete">Wyślij do divelogs.de...</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Kliknij prawym przyciskiem, by zaznaczyć miejsce nurkowania</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Identyfikator użytkownika</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">instrukcja obsługi</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Widok</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Widoczność</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Objętość:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">W</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Ostrzeżenie - ekstremalnie długie nurkowanie może spowodować znaczne wydłużenie czasu obliczeń</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Ostrzeżenie - planowanie bardzo głębokich nurkowań może spowodować znaczne wydłużenie czasu obliczeń</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Temp. wody</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Webservice</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Śro</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Balast</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Rodzaj balastu</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Waga:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">plik XML</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Rok</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Statystyka roczna</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">Istnieje już zdefiniowany komputer nurkowy tego typu
-nazwany  %s
-Subsurface może nadać nazwę temu urządzeniu, która pozwoli go odróżnić od już istniejącego. Domyślna nazwa to model i ID pokazane poniżej.
-Jeśli nie chcesz podawać własnej nazwy wybierz &apos;Anuluj&apos; a Subsurface będzie używać modelu jako nazwy (może to oznaczać, że w logach nie da się odróżnić obu komputerów od siebie).</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Istnieją niezapisane zmiany 
-Czy chcesz zapisać zmiany przed zamknięciem pliku?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Istnieją niezapisane zmiany w pliku %s
-Czy chcesz zapisać te zmiany przed zamknięciem pliku?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">powietrze</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">Pozostały czas oddychania</translation>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">wysokość</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">na kostkach</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">wynurzanie</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">na płycie</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">pas balastowy</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">z łodzi</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">zakładka</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">jaskiniowe</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">kawerna</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">sufit</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">sufit (przystanek bezpieczeństwa)</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">doczepiany</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">cuft</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">dane</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">deco</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">przystanek deco</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">głębokie</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">deepstop</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">wpis dziennika nurkowego id</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">dane o miejscu nurkowania id</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">czas nurkowania</translation>
-    </message>
-    <message>
-        <source>drift</source>
-        <translation type="obsolete">w dryfie</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">suchy</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">dla wszystkich nurkowań</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">dla nurkowania #%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">dla nurkowania nr</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">dla wybranego nurkowania</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">dla wybranych nurkowań</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">słodkowodne</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">ft</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">pełna</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">zmiana gazu</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">kierunek</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">podlodowe</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">zintegrowany</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">niepoprawne</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">niepoprawny znacznik</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">kurtka</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">jezioro</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">lbs</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">długi</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">max ppO2</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">maxCNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">Max głębokość</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">membranowy</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">min</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">model=%u (0x%08x), firmware=%u (0x%08x), numer seryjny=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">dane nurkowania id</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">więcej niż %d dni</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">nocne</translation>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">czas bezdekompresyjny</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">brak</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">próg pHe</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">próg pN%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">próg pO%s </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">pascal</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">fotografia</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">basen</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">pozostały czas na dnie</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">rzeka</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">przystanek bezpieczeństwa</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">przystanek bezpieczeństwa (obowiązkowy)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">przystanek bezpieczeństwa (opcjonalny)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">półsuchy</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">z brzegu</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">krótki</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">powierzchnia</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">nauczanie</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">Ostrzeżenie: poziom nasycenia tkanek</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">szkolenie</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">Krzysztof Arentowicz</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">nadajnik</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">nie podano</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">nieznana</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">nieokreślony</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">kamizelka</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">video</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">naruszenie</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">waga</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">mokry</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">wysiłek</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">wrakowe</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Czas</translation>
+        <translation>Czas</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Głębokość</translation>
+        <translation>Głębokość</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Temperatura</translation>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2392,57 +77,57 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Rodzaj</translation>
+        <translation>Rodzaj</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Pojemność</translation>
+        <translation>Pojemność</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2450,41 +135,41 @@ tranlators here
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Edycja nazw komputerów nurkowych</translation>
+        <translation>Edycja nazw komputerów nurkowych</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Model</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Model</translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Nazwa</translation>
+        <translation>Nazwa</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2492,12 +177,12 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2505,95 +190,87 @@ tranlators here
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Połącz grupę z grupą powyżej</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Połącz grupę z grupą poniżej</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2601,48 +278,48 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2650,23 +327,23 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2674,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">POWIETRZE</translation>
+        <translation>POWIETRZE</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Czas</translation>
+        <translation>Czas</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2712,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2730,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">min</translation>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Skafander</translation>
+        <translation>Skafander</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Butle</translation>
+        <translation>Butle</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">maxCNS</translation>
+        <translation>maxCNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Miejsce</translation>
+        <translation>Miejsce</translation>
     </message>
 </context>
 <context>
@@ -2799,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Błąd</translation>
+        <translation>Błąd</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Ponów</translation>
+        <translation>Ponów</translation>
     </message>
 </context>
 <context>
@@ -2817,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Pobierz z komputera nurkowego</translation>
+        <translation>Pobierz z komputera nurkowego</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Wymuś pobranie wszystkich nurkowań</translation>
+        <translation>Wymuś pobranie wszystkich nurkowań</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2865,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Notatki</translation>
+        <translation>Notatki</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Miejsce</translation>
+        <translation>Miejsce</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Divemaster</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Partner</translation>
+        <translation>Partner</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Ocena</translation>
+        <translation>Ocena</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Widoczność</translation>
+        <translation>Widoczność</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Skafander</translation>
+        <translation>Skafander</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Notatki</translation>
+        <translation>Notatki</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Wyposażenie</translation>
+        <translation>Wyposażenie</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Informacje</translation>
+        <translation>Informacje</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Czas nurkowania</translation>
+        <translation>Czas nurkowania</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Statystyka</translation>
+        <translation>Statystyka</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Głębokość</translation>
+        <translation>Głębokość</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatura</translation>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Czas</translation>
+        <translation>Czas</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Całkowity czas</translation>
+        <translation>Całkowity czas</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Nurkowania</translation>
+        <translation>Nurkowania</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Butle</translation>
+        <translation>Butle</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -3092,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">nieznana</translation>
+        <translation>nieznana</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">E</translation>
+        <translation>E</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">W</translation>
+        <translation>W</translation>
     </message>
 </context>
 <context>
@@ -3125,417 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Plik</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Widok</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filtr</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Pomoc</translation>
+        <translation>Filtr</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Nowy</translation>
+        <translation>Nowy</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Zapisz jako</translation>
+        <translation>Zapisz jako</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Zamknij</translation>
+        <translation>Zamknij</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Profil</translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Informacje</translation>
+        <translation>Informacje</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Ustawienia</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Wyjście</translation>
+        <translation>Ustawienia</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Edycja nazw komputerów nurkowych</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Zmień numerację</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Skalowanie wykresu</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Statystyka roczna</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Poprzedni komputer</translation>
+        <translation>Poprzedni komputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Następny komputer</translation>
+        <translation>Następny komputer</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Wybór zdarzeń</translation>
+        <translation>Wybór zdarzeń</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Wprowadź plan</translation>
+        <translation>Wprowadź plan</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">O Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">instrukcja obsługi</translation>
+        <translation>O Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Otwórz plik</translation>
+        <translation>Otwórz plik</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Zapisać zmiany?</translation>
+        <translation>Zapisać zmiany?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3545,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3563,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Jednostki</translation>
+        <translation>Jednostki</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Nurkowania</translation>
+        <translation>Nurkowania</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Głębokość</translation>
+        <translation>Głębokość</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">Metry</translation>
+        <translation>Metry</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">Stopy</translation>
+        <translation>Stopy</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Ciśnienie</translation>
+        <translation>Ciśnienie</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <translation>Bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">Litry</translation>
+        <translation>Litry</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">cuft</translation>
+        <translation>cuft</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatura</translation>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Celsjusz</translation>
+        <translation>Celsjusz</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Fahrenheit</translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Balast</translation>
+        <translation>Balast</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3853,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3861,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Nurkowanie nr</translation>
+        <translation>Nurkowanie nr</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Głębokość</translation>
+        <translation>Głębokość</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Czas</translation>
+        <translation>Czas</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Divemaster</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Partner</translation>
+        <translation>Partner</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Miejsce</translation>
+        <translation>Miejsce</translation>
     </message>
 </context>
 <context>
@@ -3899,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Drukuj tylko zaznaczone nurkowania</translation>
+        <translation>Drukuj tylko zaznaczone nurkowania</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">Drukuj w kolorze</translation>
+        <translation>Drukuj w kolorze</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Rodzaj wydruku</translation>
+        <translation>Rodzaj wydruku</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 nurkowań na stronę</translation>
+        <translation>6 nurkowań na stronę</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 nurkowania na stronę</translation>
+        <translation>2 nurkowania na stronę</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Tabela</translation>
+        <translation>Tabela</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished">Kolejność</translation>
+        <translation>Kolejność</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Profil na górze</translation>
+        <translation>Profil na górze</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Notatki na górze</translation>
+        <translation>Notatki na górze</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3984,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Edytuj</translation>
+        <translation>Edytuj</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">powietrze</translation>
+        <translation>powietrze</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Przejście na obieg otwarty</translation>
+        <translation>Przejście na obieg otwarty</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> początek</translation>
+        <translation> początek</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> koniec</translation>
+        <translation> koniec</translation>
     </message>
 </context>
 <context>
@@ -4072,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">nieznana</translation>
+        <translation>nieznana</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Butla</translation>
+        <translation>Butla</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Gaz</translation>
+        <translation>Gaz</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Użyty gaz</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Max. CNS</translation>
+        <translation>Max. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4135,50 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">POWIETRZE</translation>
+        <translation>POWIETRZE</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Zamknij</translation>
+        <translation>Zamknij</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished"></translation>
+        <translation>średnia</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished">min.</translation>
+        <translation>min.</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished">max.</translation>
+        <translation>max.</translation>
     </message>
 </context>
 <context>
@@ -4186,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Zmień numerację</translation>
+        <translation>Zmień numerację</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Nowy numer początkowy</translation>
+        <translation>Nowy numer początkowy</translation>
     </message>
 </context>
 <context>
@@ -4199,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4227,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">O Subsurface</translation>
+        <translation>O Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4255,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Webservice</translation>
+        <translation>Webservice</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Błąd połączenia:</translation>
+        <translation>Błąd połączenia:</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Niepoprawny identyfikator użytkownika!</translation>
+        <translation>Niepoprawny identyfikator użytkownika!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Nie można przetworzyć odpowiedzi!</translation>
+        <translation>Nie można przetworzyć odpowiedzi!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Pobieranie zakończone sukcesem!</translation>
+        <translation>Pobieranie zakończone sukcesem!</translation>
     </message>
 </context>
 <context>
@@ -4293,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>Bar</translation>
     </message>
 </context>
 <context>
@@ -4324,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -4345,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation>ID użytkownika</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Hasło</translation>
+        <translation>Hasło</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4383,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Rodzaj</translation>
+        <translation>Rodzaj</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Balast</translation>
+        <translation>Balast</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4402,42 +2031,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4445,7 +2074,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4453,19 +2082,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4473,64 +2102,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">pascal</translation>
+        <translation>pascal</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">cuft</translation>
+        <translation>cuft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) lub (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) lub (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4540,32 +2165,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">powietrze</translation>
+        <translation>powietrze</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">zintegrowany</translation>
+        <translation>zintegrowany</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">pas balastowy</translation>
+        <translation>pas balastowy</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">na kostkach</translation>
+        <translation>na kostkach</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">na płycie</translation>
+        <translation>na płycie</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">doczepiany</translation>
+        <translation>doczepiany</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4575,314 +2200,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Błąd odczytu &apos;%s&apos;</translation>
+        <translation>Błąd odczytu &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">brak</translation>
+        <translation>brak</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">przystanek deco</translation>
+        <translation>przystanek deco</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">pozostały czas na dnie</translation>
+        <translation>pozostały czas na dnie</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">wynurzanie</translation>
+        <translation>wynurzanie</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">sufit</translation>
+        <translation>sufit</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">wysiłek</translation>
+        <translation>wysiłek</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">nadajnik</translation>
+        <translation>nadajnik</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">naruszenie</translation>
+        <translation>naruszenie</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">zakładka</translation>
+        <translation>zakładka</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">powierzchnia</translation>
+        <translation>powierzchnia</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">przystanek bezpieczeństwa</translation>
+        <translation>przystanek bezpieczeństwa</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">zmiana gazu</translation>
+        <translation>zmiana gazu</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">przystanek bezpieczeństwa (opcjonalny)</translation>
+        <translation>przystanek bezpieczeństwa (opcjonalny)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">przystanek bezpieczeństwa (obowiązkowy)</translation>
+        <translation>przystanek bezpieczeństwa (obowiązkowy)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">deepstop</translation>
+        <translation>deepstop</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">sufit (przystanek bezpieczeństwa)</translation>
+        <translation>sufit (przystanek bezpieczeństwa)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">czas nurkowania</translation>
+        <translation>czas nurkowania</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">Max głębokość</translation>
+        <translation>Max głębokość</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">Ekspozycja tlenowa</translation>
+        <translation>Ekspozycja tlenowa</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">Pozostały czas oddychania</translation>
+        <translation>Pozostały czas oddychania</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">kierunek</translation>
+        <translation>kierunek</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">Ostrzeżenie: poziom nasycenia tkanek</translation>
+        <translation>Ostrzeżenie: poziom nasycenia tkanek</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">czas bezdekompresyjny</translation>
+        <translation>czas bezdekompresyjny</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">niepoprawny znacznik</translation>
+        <translation>niepoprawny znacznik</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Nie udało się utworzyć parsera dla %s %s</translation>
+        <translation>Nie udało się utworzyć parsera dla %s %s</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Błąd podczas przetwarzania danych</translation>
+        <translation>Błąd podczas przetwarzania danych</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Błąd podczas przetwarzania daty i czasu</translation>
+        <translation>Błąd podczas przetwarzania daty i czasu</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Nurkowanie %d: %s %d %04d</translation>
+        <translation>Nurkowanie %d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Błąd podczas przetwarzania czasu nurkowania</translation>
+        <translation>Błąd podczas przetwarzania czasu nurkowania</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Błąd podczas przetwarzania głębokości</translation>
+        <translation>Błąd podczas przetwarzania głębokości</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Błąd podczas przetwarzania danych o ilości użytych rodzajów gazu</translation>
+        <translation>Błąd podczas przetwarzania danych o ilości użytych rodzajów gazu</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Błąd podczas przetwarzania danych o zasoleniu</translation>
+        <translation>Błąd podczas przetwarzania danych o zasoleniu</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Błąd podczas przetwarzania danych o użytym rodzaju gazu</translation>
+        <translation>Błąd podczas przetwarzania danych o użytym rodzaju gazu</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Błąd podczas przetwarzania próbek</translation>
+        <translation>Błąd podczas przetwarzania próbek</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Oczekiwanie na działanie użytkownika</translation>
+        <translation>Oczekiwanie na działanie użytkownika</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), numer seryjny=%u (0x%08x)</translation>
+        <translation>model=%u (0x%08x), firmware=%u (0x%08x), numer seryjny=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Błąd rejestracji uchwytu (event handler)</translation>
+        <translation>Błąd rejestracji uchwytu (event handler)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Błąd rejestracji uchwytu (cancellation handler)</translation>
+        <translation>Błąd rejestracji uchwytu (cancellation handler)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Błąd podczas importowania danych</translation>
+        <translation>Błąd podczas importowania danych</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">Nie można utworzyć kontekstu libdivecomputer</translation>
+        <translation>Nie można utworzyć kontekstu libdivecomputer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Nie udało się otworzyć %s %s (%s)</translation>
+        <translation>Nie udało się otworzyć %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Podejrzany skład procentowy %s
+        <translation>Podejrzany skład procentowy %s
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Nie udało się przetworzyć &apos;%s&apos;.
+        <translation>Nie udało się przetworzyć &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Nie udało się przetworzyć &apos;%s&apos;</translation>
+        <translation>Nie udało się przetworzyć &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished">Zapytanie bazy danych  get_events nie powiodło się.⏎
+        <translation>Zapytanie bazy danych  get_events nie powiodło się.⏎
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished">Błąd połączenia z bazą danych &apos;%s&apos;.⏎
+        <translation>Błąd połączenia z bazą danych &apos;%s&apos;.⏎
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished">Błąd komunikacji z bazą danych &apos;%s&apos;.
+        <translation>Błąd komunikacji z bazą danych &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">Nie można otworzyć arkusza stylów (%s)/%s</translation>
+        <translation>Nie można otworzyć arkusza stylów (%s)/%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Nie znaleziono gazu %d/%d</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">butle do zaplanowania</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Symulowane nurkowanie</translation>
+        <translation>Nie znaleziono gazu %d/%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">Zbyt wiele rodzajów gazu</translation>
+        <translation>Zbyt wiele rodzajów gazu</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4891,7 +2508,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Subsurface - Plan Nurkownia
 w oparciu o GFlow = %.0f oraz GFhigh = %.0f
 
@@ -4901,166 +2518,162 @@ w oparciu o GFlow = %.0f oraz GFhigh = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Przejście do  %.*f %s w %d:%02d min - runtime %d:%02u z %s
+        <translation>Przejście do  %.*f %s w %d:%02d min - runtime %d:%02u z %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s
+        <translation>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Zmiana gazu na %s
+        <translation>Zmiana gazu na %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Zużycie gazu:
+        <translation>Zużycie gazu:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s z %s
+        <translation>%.0f%s z %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">Gł:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 P:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Obliczony sufit %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Przyst. bezp.:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Przyst. bezp.:nieznany czas @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deco:nieznany czas @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 dekompresja</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
@@ -5069,7 +2682,7 @@ MOD:%d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 EAD:%d%s
 END:%d%s
 EADD:%d%s</translation>
@@ -5078,352 +2691,336 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">niepoprawne</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">z łodzi</translation>
+        <translation>z łodzi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">z brzegu</translation>
+        <translation>z brzegu</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished">w dryfie</translation>
+        <translation>w dryfie</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">głębokie</translation>
+        <translation>głębokie</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">kawerna</translation>
+        <translation>kawerna</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">podlodowe</translation>
+        <translation>podlodowe</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">wrakowe</translation>
+        <translation>wrakowe</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">jaskiniowe</translation>
+        <translation>jaskiniowe</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">wysokość</translation>
+        <translation>wysokość</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">basen</translation>
+        <translation>basen</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">jezioro</translation>
+        <translation>jezioro</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">rzeka</translation>
+        <translation>rzeka</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">nocne</translation>
+        <translation>nocne</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">słodkowodne</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">szkolenie</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">nauczanie</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">fotografia</translation>
+        <translation>fotografia</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">video</translation>
+        <translation>video</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">deco</translation>
+        <translation>deco</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">więcej niż %d dni</translation>
+        <translation>więcej niż %d dni</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dd %dh %dmin</translation>
+        <translation>%dd %dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dh %dmin</translation>
+        <translation>%dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">dla nurkowania nr</translation>
+        <translation>dla nurkowania nr</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">dla wybranych nurkowań</translation>
+        <translation>dla wybranych nurkowań</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">dla nurkowania #%d</translation>
+        <translation>dla nurkowania #%d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">dla wybranego nurkowania</translation>
+        <translation>dla wybranego nurkowania</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">dla wszystkich nurkowań</translation>
+        <translation>dla wszystkich nurkowań</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(brak nurkowań)</translation>
+        <translation>(brak nurkowań)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">Nie</translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">Pon</translation>
+        <translation>Pon</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">Wto</translation>
+        <translation>Wto</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">Śro</translation>
+        <translation>Śro</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">Czw</translation>
+        <translation>Czw</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">Pią</translation>
+        <translation>Pią</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">Sob</translation>
+        <translation>Sob</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">Sty</translation>
+        <translation>Sty</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">Lut</translation>
+        <translation>Lut</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">Mar</translation>
+        <translation>Mar</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">Kwi</translation>
+        <translation>Kwi</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">Maj</translation>
+        <translation>Maj</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">Cze</translation>
+        <translation>Cze</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">Lip</translation>
+        <translation>Lip</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">Sie</translation>
+        <translation>Sie</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">Wrz</translation>
+        <translation>Wrz</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">Paź</translation>
+        <translation>Paź</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">Lis</translation>
+        <translation>Lis</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">Gru</translation>
+        <translation>Gru</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zurich: System plików jest prawie pełen
+        <translation>Uemis Zurich: System plików jest prawie pełen
 Odłącz i podłącz ponownie komputer nurkowy 
 i wybierz &apos;Ponów&apos;</translation>
     </message>
@@ -5432,7 +3029,7 @@ i wybierz &apos;Ponów&apos;</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zurich: System plików jest pełen
+        <translation>Uemis Zurich: System plików jest pełen
 Odłącz i podłącz ponownie komputer nurkowy
 i spróbuj jeszcze raz.</translation>
     </message>
@@ -5440,193 +3037,193 @@ i spróbuj jeszcze raz.</translation>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Nieudany zapis do pliku req.txt 
+        <translation>Nieudany zapis do pliku req.txt 
 Czy Uemis Zurich jest podłączony poprawnie?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">nieznana</translation>
+        <translation>nieznana</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Czytanie %s %s</translation>
+        <translation>Czytanie %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">dane</translation>
+        <translation>dane</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">wpis dziennika nurkowego id</translation>
+        <translation>wpis dziennika nurkowego id</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">dane o miejscu nurkowania id</translation>
+        <translation>dane o miejscu nurkowania id</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">dane nurkowania id</translation>
+        <translation>dane nurkowania id</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">mokry</translation>
+        <translation>mokry</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">półsuchy</translation>
+        <translation>półsuchy</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">suchy</translation>
+        <translation>suchy</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">krótki</translation>
+        <translation>krótki</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">kamizelka</translation>
+        <translation>kamizelka</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">długi</translation>
+        <translation>długi</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">kurtka</translation>
+        <translation>kurtka</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">pełna</translation>
+        <translation>pełna</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">pełna dwuczęściowa</translation>
+        <translation>pełna dwuczęściowa</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">membranowy</translation>
+        <translation>membranowy</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Nawiązywanie łączności</translation>
+        <translation>Nawiązywanie łączności</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Błąd inicjalizacji Uemis </translation>
+        <translation>Błąd inicjalizacji Uemis </translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Rozpocznij pobieranie</translation>
+        <translation>Rozpocznij pobieranie</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Pominięcie przystanku bezpieczeństwa</translation>
+        <translation>Pominięcie przystanku bezpieczeństwa</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Alarm prędkości wynurzania</translation>
+        <translation>Alarm prędkości wynurzania</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Ostrzeżenie: prędkość wynurzania</translation>
+        <translation>Ostrzeżenie: prędkość wynurzania</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Ostrzeżenie: PO2 zielone</translation>
+        <translation>Ostrzeżenie: PO2 zielone</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Ostrzeżenie: wynurzanie / PO2</translation>
+        <translation>Ostrzeżenie: wynurzanie / PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Alarm: wynurzanie / PO2 </translation>
+        <translation>Alarm: wynurzanie / PO2 </translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Ciśnienie w butli</translation>
+        <translation>Ciśnienie w butli</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Ostrzeżenie: ilość gazu</translation>
+        <translation>Ostrzeżenie: ilość gazu</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Alarm: ilość gazu</translation>
+        <translation>Alarm: ilość gazu</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Zalecana zmiana gazu</translation>
+        <translation>Zalecana zmiana gazu</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Przekroczenie limitu głębokości</translation>
+        <translation>Przekroczenie limitu głębokości</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Ostrzeżenie: maksymalny czas dekompresji</translation>
+        <translation>Ostrzeżenie: maksymalny czas dekompresji</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Informacja: czas nurkowania</translation>
+        <translation>Informacja: czas nurkowania</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Alarm: czas nurkowania</translation>
+        <translation>Alarm: czas nurkowania</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Znacznik</translation>
+        <translation>Znacznik</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Brak danych o butli</translation>
+        <translation>Brak danych o butli</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Ostrzeżenie: niski poziom baterii</translation>
+        <translation>Ostrzeżenie: niski poziom baterii</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Alarm: niski poziom baterii</translation>
+        <translation>Alarm: niski poziom baterii</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts
index a86ec9007..42366cc5a 100644
--- a/translations/subsurface_pt_BR.ts
+++ b/translations/subsurface_pt_BR.ts
@@ -1,635 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="br_FR">
-<context>
-    <name></name>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete">&gt; Mês</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete">Download</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete">Por favor, selecione o seu dispositivo e computador de mergulho.</translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">início</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">fim</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">#</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s de %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dd %dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deco:tempo desconhecido @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Plano de Mergulho Subsurface
-baseado em GFlow = %.0f e GFhigh = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 mergulhos por página</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">AR</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">Sobre o Subsurface</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Adicionar mergulho...</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Adicionar mergulho...</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Pressão do Ar</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Temperatura do Ar</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Temperatuda do ar em %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">Abr</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">Ago</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Média</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Média</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Média</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Média</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Profundidade Média</translation>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">SAC Média</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Temperatura Média</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Parceiro</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Celsius</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Fechar</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Conectando...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Erro de conexão:</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Cilindro</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Cilindro para planejamento</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Cilindros</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Data e Hora</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Data:</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Remover mergulho</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Remover mergulhos</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Profundidade</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Limite de profundidade excedido</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Profundidade:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">ID do dispositivo</translation>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Apelido do computador de mergulho</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Info do mergulho</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Notas do mergulho</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Tempo de mergulho</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Alerta de tempo de mergulho</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Info de tempo de mergulho</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Fabricante do computador e produto</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Pontos de mergulho</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Professor de mergulho</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Quando começa o mergulho?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Mergulho#</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Instrutor de Mergulho</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editar</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Editar mergulho</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Editar mergulhos</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Editar múltiplos mergulhos</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Erro</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Arquivo</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Importar arquivo(s)...</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Opções de layout</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Local</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Alerta de nível de bateria</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Aviso de nível de bateria</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Marcador</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Máximo</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Máximo</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Máximo</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">Mai</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Mesclar mergulhos</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">Metro</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Profundidade mínima</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Temperatura Mínima</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Apelido</translation>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Notas no topo</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Abrir arquivo</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Senha</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Perfil</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Configurações de perfil</translation>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Perfil no topo</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Remover</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Salvar aquivo como</translation>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Unidades</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Visualizar</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Visibilidade</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Volume:</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Ano</translation>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">ar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">altitude</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">cinto</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">barco</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">favorito</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">caverna</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">data</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">deco</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">profundo</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">roupa seca</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">para todos os mergulhos</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">águar gelada</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">gelo</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">integrado</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">inválido</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">numero de evento inválido</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">colete</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">lago</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">lbs</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">max ppO2</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">maxdepth</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">membrana</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">min</translation>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">noite</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">foto</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">piscina</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">rio</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">ensinando</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">treinando</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">créditos-de-tradução</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">vídeo</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Profundidade</translation>
+        <translation>Profundidade</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -637,57 +77,57 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -695,41 +135,41 @@ tranlators here
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished"></translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Apelido</translation>
+        <translation>Apelido</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -737,12 +177,12 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -750,87 +190,87 @@ tranlators here
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -838,48 +278,48 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -887,23 +327,23 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -911,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">AR</translation>
+        <translation>AR</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -949,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -967,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">min</translation>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Local</translation>
+        <translation>Local</translation>
     </message>
 </context>
 <context>
@@ -1036,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Erro</translation>
+        <translation>Erro</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1054,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1102,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Notas do mergulho</translation>
+        <translation>Notas do mergulho</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Local</translation>
+        <translation>Local</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Instrutor de Mergulho</translation>
+        <translation>Instrutor de Mergulho</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Parceiro</translation>
+        <translation>Parceiro</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Visibilidade</translation>
+        <translation>Visibilidade</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Info do mergulho</translation>
+        <translation>Info do mergulho</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Tempo de mergulho</translation>
+        <translation>Tempo de mergulho</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Profundidade</translation>
+        <translation>Profundidade</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Cilindros</translation>
+        <translation>Cilindros</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -1329,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1362,389 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Arquivo</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Visualizar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Fechar</translation>
+        <translation>Fechar</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Perfil</translation>
+        <translation>Perfil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Sobre o Subsurface</translation>
+        <translation>Sobre o Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Abrir arquivo</translation>
+        <translation>Abrir arquivo</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -1754,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1772,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Unidades</translation>
+        <translation>Unidades</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Profundidade</translation>
+        <translation>Profundidade</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">Metro</translation>
+        <translation>Metro</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Celsius</translation>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2062,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2070,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Mergulho#</translation>
+        <translation>Mergulho#</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Profundidade</translation>
+        <translation>Profundidade</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Parceiro</translation>
+        <translation>Parceiro</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Local</translation>
+        <translation>Local</translation>
     </message>
 </context>
 <context>
@@ -2108,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 mergulhos por página</translation>
+        <translation>6 mergulhos por página</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">6 mergulhos por página {2 ?}</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Perfil no topo</translation>
+        <translation>Perfil no topo</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Notas no topo</translation>
+        <translation>Notas no topo</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2193,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Editar</translation>
+        <translation>Editar</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">ar</translation>
+        <translation>ar</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">início</translation>
+        <translation>início</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">fim</translation>
+        <translation>fim</translation>
     </message>
 </context>
 <context>
@@ -2281,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Cilindro</translation>
+        <translation>Cilindro</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2344,42 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">AR</translation>
+        <translation>AR</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Fechar</translation>
+        <translation>Fechar</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Média</translation>
+        <translation>Média</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished">Máximo</translation>
+        <translation>Máximo</translation>
     </message>
 </context>
 <context>
@@ -2387,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2400,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2428,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Sobre o Subsurface</translation>
+        <translation>Sobre o Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2456,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Erro de conexão:</translation>
+        <translation>Erro de conexão:</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2494,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2525,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -2546,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Senha</translation>
+        <translation>Senha</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2584,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2603,42 +2031,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -2646,7 +2074,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -2654,19 +2082,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2674,60 +2102,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">lbs</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -2737,32 +2165,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">ar</translation>
+        <translation>ar</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">integrado</translation>
+        <translation>integrado</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">cinto</translation>
+        <translation>cinto</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -2772,305 +2200,301 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">favorito</translation>
+        <translation>favorito</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">maxdepth</translation>
+        <translation>maxdepth</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">numero de evento inválido</translation>
+        <translation>numero de evento inválido</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Cilindro para planejamento</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -3079,7 +2503,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Plano de Mergulho Subsurface
 baseado em GFlow = %.0f e GFhigh = %.0f
 
@@ -3089,146 +2513,146 @@ baseado em GFlow = %.0f e GFhigh = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s de %s
+        <translation>%.0f%s de %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deco:tempo desconhecido @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1247"/>
@@ -3236,556 +2660,540 @@ MOD:%d%s</source>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">inválido</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">barco</translation>
+        <translation>barco</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">profundo</translation>
+        <translation>profundo</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">caverna</translation>
+        <translation>caverna</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">gelo</translation>
+        <translation>gelo</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">altitude</translation>
+        <translation>altitude</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">piscina</translation>
+        <translation>piscina</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">lago</translation>
+        <translation>lago</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">rio</translation>
+        <translation>rio</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">noite</translation>
+        <translation>noite</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">águar gelada</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">treinando</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">ensinando</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">foto</translation>
+        <translation>foto</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">vídeo</translation>
+        <translation>vídeo</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">deco</translation>
+        <translation>deco</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dd %dh %dmin</translation>
+        <translation>%dd %dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dh %dmin</translation>
+        <translation>%dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">para todos os mergulhos</translation>
+        <translation>para todos os mergulhos</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">Abr</translation>
+        <translation>Abr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">Mai</translation>
+        <translation>Mai</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">Ago</translation>
+        <translation>Ago</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="25"/>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">data</translation>
+        <translation>data</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">roupa seca</translation>
+        <translation>roupa seca</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">colete</translation>
+        <translation>colete</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">membrana</translation>
+        <translation>membrana</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciar download</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarme de velocidade</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Aviso de velocidade</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Limite de profundidade excedido</translation>
+        <translation>Limite de profundidade excedido</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Info de tempo de mergulho</translation>
+        <translation>Info de tempo de mergulho</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Alerta de tempo de mergulho</translation>
+        <translation>Alerta de tempo de mergulho</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Marcador</translation>
+        <translation>Marcador</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Aviso de nível de bateria</translation>
+        <translation>Aviso de nível de bateria</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Alerta de nível de bateria</translation>
+        <translation>Alerta de nível de bateria</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts
index 4ebdb18d7..e8d246354 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -1,2061 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="pt_PT">
-<context>
-    <name></name>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete">&gt; Mês</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete">Transferir</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete"> Por favor, seleccione o computador de mergulho.</translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">iniciar</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">fim</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">#</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s de %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d minutos</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dd, %dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-Tecto calculado %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deco:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deco:Tempo desconhecido @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-PEA:%d%s
-PNE:%d%s
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-Em deco</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL:%umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-P:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Paragem de segurança:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Paragem de segurança:tempo desconhecido @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Plano de mergulho Subsurface
-baseado em GFinferior = %.0f  y  GFsuperior = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) ou (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(nenhum mergulho)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(vazio)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 pés³/min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 pés³/min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 l/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 mergulhos por página</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">Fato completo 2 peças</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 l/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">Incrementos de 3m para o tecto calculado</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 imersões por página</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">AR</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">Sobre Subsurface</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Adicionar mergulho ...</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Adicionar mergulho</translation>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Adicionar à expedição de mergulho anterior</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Adicionar ponto da rota</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Pressão atmosférica</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Temperatura do ar</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Temperatura do ar em %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Preferir sempre mergulho transferido</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">Abr</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">Ago</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Auto Agrupar</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Média</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Média</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Média</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Média</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Prof. média</translation>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">SAC médio</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Temp média</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Tempo médio</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Troca de emergência para OC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">Bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Parceiro</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CC SetPoint</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Não encontro o gás %d/%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Cancelado, a fechar ...</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Cancelado...</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Não consigo analisar a resposta !</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Celsius</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Seleccionar arquivo XML predeterminado</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Seleccionar ficheiro XML para importar para arquivo de dados actual</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Encerrar</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Colapsar</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Ligar ...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Erro de ligação:</translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Atribuir a uma nova expedição de mergulho</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">pé^3</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Cil</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Garrafa</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Garrafa para planear</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Garrafas</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">P:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">CLÁUSULA DE DESRESPONSABILIZAÇÃO/AVISO:ESTA É UMA NOVA IMPLEMENTAÇÃO DO ALGORITMO BUHLMANN E DO SEU PLANEADOR DE MERGULHOS DERIVADO AO QUAL  SÓ FORAM REALIZADOS TESTES DE FORMA LIMITADA. RECOMENDAMOS FORTEMENTE PARA NUNCA PLANEAR MERGULHOS BASEADOS SIMPLESMENTE NOS RESULTADOS OBTIDOS AQUI.</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Data e hora</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Data:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">Dez</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">Ficheiro XML por omissão</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Eliminar entrada do computador de mergulho</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Eliminar mergulho</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Eliminar mergulhos</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Profundidade</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Limite de profundidade ultrapassado</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Profundidade:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Identificador de dispositivo</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Dispositivo ou &quot;mount point&quot;</translation>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Mergulho #%d -</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Mergulho #%d:%s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Nome do computador de mergulho</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Informação do mergulho</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Notas do mergulho</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Plano de Mergulho - ISTO UMA SIMULAÇÃO; NÃO USAR PARA MERGULHAR</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Duração do mergulho</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Alerta de duração de mergulho</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Informação sobre a duração do mergulho</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Fabricante e modelo</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Erro na importação dos dados do mergulho</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Locais de mergulho</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Dive master</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Quando inicia o mergulho ?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Mergulho #</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Fonte da lista de mergulhos</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Divemaster</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Mergulhos</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Locais de Mergulho</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Transferir do Computador de Mergulho</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Transferir do Computador de Mergulho...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Transferir do serviço web</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Transferir do serviço web ...</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Operação de transferência bem sucedida!</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Duração</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Duração (min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">E</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editar</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Editar nomes do dispositivo</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Editar nomes do computador de mergulho</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Editar informação da expedição de mergulho</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Editar resumo da expedição de mergulho</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Editar o nome de um computador de mergulho por duplo clique no campo do nome correspondente</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Editar mergulho</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Editar data e hora de mergulho</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Editar mergulhos</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Editar múltiplos mergulhos</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Editar resumo da expedição de mergulho</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Activar / Desactivar eventos</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Fim</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Profundidade final</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Introduzir uma identificação do utilizador e seleccionar &quot;Transferir&quot;. Após terminar seleccionar &quot;Aplicar&quot;.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Equipamento</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Erro na obtenção da salinidade da água.</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Erro na análise da data</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Erro na análise do tempo de mergulho</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Erro na análise da mistura de gás</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Erro na análise na contagem da mistura de gás</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Erro na análise da profundidade máxima</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Erro na análise das amostras</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Erro no registo do &quot;cancellation handler&quot;.</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Erro no registo de dados</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Erro no registo do &quot;event handler&quot;.</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Evento: Hora de sistema=%&lt;PRId64&gt;, Hora do dispositivo=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Evento: à espera de acção do utilizador</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Expandir todos</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Falha ao abrir  %i ficheiros.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Falha na análise de &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Falha na análise de &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Falha na leitura de &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Falha na leitura de &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">Feb</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">Pés</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Ficheiro</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filtros</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Forçar a transferência de todos os mergulhos</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Sex</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFAlto</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFalto para planear</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFbaixo</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFbaixo para planear</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS(formato WGS84 ou GPS)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Gás usado</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Gás usado</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Gás usado</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Consumo de gás:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Mistura de gás</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Definições Gerais</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Ajuda</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">parado</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Info</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Iniciar Comunicação</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Introduzir Plano</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Profundidade inválida - Falha na análise  &quot;%s&quot;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Profundidade inválida - Não são suportadas profundidades superiores a 400m</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Gás inválido na coluna %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Hora de início inválida</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Identificação de utilizador inválida !</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Jan</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">Jul</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">Jun</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel y otros, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Lista</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">Litro</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Localização</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Registos</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Mais Prolongado</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Mergulho mais prolongado</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Alerta de Bateria Baixa</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Advertência de Bateria Baixa</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Marcar localização aquí</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Marcador</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Guía</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Advertência de tempo máx deco</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Profundidade máx</translation>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Máx SAC</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Máx. Temp.</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Profundidade Máxima: %.*f %s
-Duração :%d minutos
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Máx. CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Press. máx.</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Máxima</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Máximo</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Máxima</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">Maio</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Juntar mergulhos</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Integrar expedição à de cima</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Integrar expedição à de baixo</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">Metro</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Profundidad mínima</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Mín SAC</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Mín Temp</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Mínima</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Mínimo</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Mínima</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Opções diversas</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Modelo</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Seg</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">DiveLog multi-plataforma escrito em C </translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Novo</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Novo número de início</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Seguinte DC</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Sem dados registados da garrafa</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notas</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">Nov</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">OLF</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">Out</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Erro &quot;pthread&quot; estranho</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Ok para remover entrada seleccionada ?</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Abrir Ficheiro</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Abrir...</translation>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Oxigénio</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Alarme de Subida PpO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Aviso de Ascenção PpO2</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Aviso Verde PpO2</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">PSI</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Seleccionar no mapa</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Planeamento</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Preferências</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Preferências...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Pressão</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Pressão:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Anterior DC</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Imprimir apenas mergulhos seleccionados</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Imprimir selecção</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Tipo de impressão</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Imprimir...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Perfil</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Ajustes de perfil</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Sair</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Alerta de tempo de gás restante</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Aviso tempo de gás restante</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Classificação</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">A ler %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Eliminar expedição de mergulho</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Eliminar mergulho da expedição</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Remover mergulhos da expedição seleccionada</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Alterar numeração</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Alterar numeração...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Repetir</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">SAC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">SAC em paragem deco</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">SAC em fundo</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Transgressão na paragem de segurança</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sáb</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Guardar como...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Guardar alterações?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Guardar Ficheiro Como</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Guardar como...</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Guardar...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Duração do segmento</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Seleccionar Eventos</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Seleccionar Eventos...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">Set</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Escrita do ficheiro req.txt curta.
-Está Uemis Zúrich correctamente ligado?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Mais curto</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Mergulho mais curto</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Mostrar Colunas</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">Mostrar PEA, PNE, EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">Mostrar MOD</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Mostrar o tecto calculado</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Mostrar a vermelho o tecto reportado pelo dc</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Mostrar no mapa</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">Mostrar gráfico de pHe</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">Mostrar gráfico de pN%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">Mostrar gráfico de pO%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Mergulho simulado</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Alarme de Velocidade</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Advertência de velocidade</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Início</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Começar transferência</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Estatísticas</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Estatísticas %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Estatísticas</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Estado</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Permanecer a  %.*f %s durante %d:%02d min - runtime %d:%02u a %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Fato</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Interv. Superf.</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Pressão atmosférica (mbar) </translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Alterar gás para %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Imprimir tabela</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Sugestão de troca de garrafa</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Informação da pressão da garrafa</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Definições técnicas</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Temp</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Temperatura</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Temperatura:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Todo</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Qui</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Tempo</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Para editar esta informação do mergulho
-seleccione-o na lista abaixo com duplo clique.</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Activar / Desactivar Zoom</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">Demasiadas misturas de gás</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">Demasiados pontos na rota</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Total</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Tempo total</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Peso total:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Transição de cota %.*f %s em %d:%02d min - runtime %d:%02u com %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Expedição %1$s, %2$s %3$d, %4$d (%5$d mergulho)</numerusform>
-            <numerusform>Viagem %1$s, %2$s %3$d, %4$d (%5$d mergulhos)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ter</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Tipo</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zurich: O sistema de ficheiros está quase cheio
-Desligue / religue o computador de mergulho
-e clique em &quot;Repetir&quot;</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zurich: sistema de ficheiros está cheio
-Desligue / religue o computador de mergulho
-e tentar novamente</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Falha ao iniciar Uemis</translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">Não é possivel criar contexto do libdivecomputer</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Não é possivel criar o &quot;parser&quot; para %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Não se consegue abrir  %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Unidades</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Usar clique direito para marcar no cursor a localização do mergulho</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Identificador de utilizador</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Ver</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Visibilidade</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Volume:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">O</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Aviso - Mergulhos extremamente longos podem provocar tempos de cálculos demorados</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Aviso - Planear mergulhos muito profundos pode demorar demasiado tempo</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Temp. de Água</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Serviço web</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Qua</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Peso</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Sistema de lastro</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Peso:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">Ficheiro XML </translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Ano</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Estatísticas anuais</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">Tem já um computador de mergulho deste modelo
-chamado %s
- Subsurface pode manter um diminutivo para este aparelho para o distinguir do já existente. Por omissão o modelo e identificador do aparelho usado é como mostrado em baixo.
-Se não pretender atribuir um nome a este computador de mergulho, seleccione &apos;Cancelar&apos;. Subsurface irá simplesmente mostrar como nome, o seu modelo (isto significa que não terá meio de distinguir ambos no registo de mergulho).</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Existem alterações ainda não gravadas
-Deseja as guardar antes de fechar o ficheiro de dados ?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Existem alterações por guardar no ficheiro: %s 
-Deseja guardar antes de fechar o ficheiro de dados ?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">ar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">tempo de ar</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">tornozelo</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">subida</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">lastro no arnês</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">cinto</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">favorito</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">tecto</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">tecto (paragem de segurança)</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">clip-on</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">pés^3</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">dados</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">deco</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">paragem de deco</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">paragem de profundidade</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">identificador no diário de mergulho</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">identificação do local de mergulho</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">duração do mergulho</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">fato seco</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">para todos os mergulhos</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">para mergulho #%d -</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">para mergulhos #</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">para mergulho seleccionado</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">para mergulhos seleccionados</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">pés</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">fato completo</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">mudança de gás</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">cabeçalho</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">integrado</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">Número de evento inválido</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">colete</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">libra</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">long john</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">máx ppO2</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">máxCNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">Profundidade Máx</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">membrana</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">min</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">mais dados do identificador de mergulho</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">mais de %d dias</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">tempo sem paragem</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">nenhum</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">limiar de pHe</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">limiar de pN%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">limiar de pO%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">pascal</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">rbt</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">paragem de segurança</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">paragem de segurança (obrigatória)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">paragem de segurança (voluntária)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">semiseco</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">shorty</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">superfície</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">Alarme do nível nos tecidos</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">José Ángel Tortosa Delfa
-Pablo García Castro
-Matthias Kaehlcke
-Sergio Schvezov
-Auni Somero
-Henrik Brautaset Aronsen (who doesn&apos;t speak Spanish)
-and Salvador Cuñat</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">transmissor</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">desc</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">desconhecido</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">não especificado</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">camisola</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">transgressão</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">peso</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">fato húmido</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">carga</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Tempo</translation>
+        <translation>Tempo</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Profundidade</translation>
+        <translation>Profundidade</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Temp</translation>
+        <translation>Temp</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2063,57 +77,57 @@ and Salvador Cuñat</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Tipo</translation>
+        <translation>Tipo</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Tamanho</translation>
+        <translation>Tamanho</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2121,41 +135,41 @@ and Salvador Cuñat</translation>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Editar nomes do computador de mergulho</translation>
+        <translation>Editar nomes do computador de mergulho</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Modelo</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Modelo</translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Nome</translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2163,12 +177,12 @@ and Salvador Cuñat</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2176,95 +190,87 @@ and Salvador Cuñat</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Integrar expedição à de cima</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Integrar expedição à de baixo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2272,48 +278,48 @@ and Salvador Cuñat</translation>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2321,23 +327,23 @@ and Salvador Cuñat</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2345,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">AR</translation>
+        <translation>AR</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Duração</translation>
+        <translation>Duração</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2383,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2401,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">pés</translation>
+        <translation>pés</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">min</translation>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">libra</translation>
+        <translation>libra</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Fato</translation>
+        <translation>Fato</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Cil</translation>
+        <translation>Cil</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">máxCNS</translation>
+        <translation>máxCNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Localização</translation>
+        <translation>Localização</translation>
     </message>
 </context>
 <context>
@@ -2470,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Repetir</translation>
+        <translation>Repetir</translation>
     </message>
 </context>
 <context>
@@ -2488,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Transferir do Computador de Mergulho</translation>
+        <translation>Transferir do Computador de Mergulho</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Forçar a transferência de todos os mergulhos</translation>
+        <translation>Forçar a transferência de todos os mergulhos</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2536,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Notas do mergulho</translation>
+        <translation>Notas do mergulho</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Localização</translation>
+        <translation>Localização</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Divemaster</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Parceiro</translation>
+        <translation>Parceiro</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Classificação</translation>
+        <translation>Classificação</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Visibilidade</translation>
+        <translation>Visibilidade</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Fato</translation>
+        <translation>Fato</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Notas</translation>
+        <translation>Notas</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Equipamento</translation>
+        <translation>Equipamento</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Informação do mergulho</translation>
+        <translation>Informação do mergulho</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Duração do mergulho</translation>
+        <translation>Duração do mergulho</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Estatísticas</translation>
+        <translation>Estatísticas</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Profundidade</translation>
+        <translation>Profundidade</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatura</translation>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Duração</translation>
+        <translation>Duração</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Tempo total</translation>
+        <translation>Tempo total</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Mergulhos</translation>
+        <translation>Mergulhos</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Garrafas</translation>
+        <translation>Garrafas</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -2763,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">desconhecido</translation>
+        <translation>desconhecido</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">E</translation>
+        <translation>E</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">O</translation>
+        <translation>O</translation>
     </message>
 </context>
 <context>
@@ -2796,413 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Ficheiro</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Registos</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Ver</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filtros</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Ajuda</translation>
+        <translation>Filtros</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Novo</translation>
+        <translation>Novo</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Guardar como...</translation>
+        <translation>Guardar como...</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Encerrar</translation>
+        <translation>Encerrar</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Perfil</translation>
+        <translation>Perfil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Info</translation>
+        <translation>Info</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Preferências</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Sair</translation>
+        <translation>Preferências</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Editar nomes do dispositivo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Alterar numeração</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Activar / Desactivar Zoom</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Estatísticas anuais</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Anterior DC</translation>
+        <translation>Anterior DC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Seguinte DC</translation>
+        <translation>Seguinte DC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Seleccionar Eventos</translation>
+        <translation>Seleccionar Eventos</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Introduzir Plano</translation>
+        <translation>Introduzir Plano</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Sobre Subsurface</translation>
+        <translation>Sobre Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Abrir Ficheiro</translation>
+        <translation>Abrir Ficheiro</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Guardar alterações?</translation>
+        <translation>Guardar alterações?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3212,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3230,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Unidades</translation>
+        <translation>Unidades</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Mergulhos</translation>
+        <translation>Mergulhos</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Profundidade</translation>
+        <translation>Profundidade</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">Metro</translation>
+        <translation>Metro</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">Pés</translation>
+        <translation>Pés</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Pressão</translation>
+        <translation>Pressão</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <translation>Bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">Litro</translation>
+        <translation>Litro</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">pé^3</translation>
+        <translation>pé^3</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatura</translation>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Celsius</translation>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Fahrenheit</translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Peso</translation>
+        <translation>Peso</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">libra</translation>
+        <translation>libra</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3520,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3528,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Mergulho #</translation>
+        <translation>Mergulho #</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Profundidade</translation>
+        <translation>Profundidade</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Duração</translation>
+        <translation>Duração</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Guía</translation>
+        <translation>Guía</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Parceiro</translation>
+        <translation>Parceiro</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Localização</translation>
+        <translation>Localização</translation>
     </message>
 </context>
 <context>
@@ -3566,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Imprimir apenas mergulhos seleccionados</translation>
+        <translation>Imprimir apenas mergulhos seleccionados</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished"></translation>
+        <translation>Imprimir a cores</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Tipo de impressão</translation>
+        <translation>Tipo de impressão</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 imersões por página</translation>
+        <translation>6 imersões por página</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 mergulhos por página</translation>
+        <translation>2 mergulhos por página</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Imprimir tabela</translation>
+        <translation>Imprimir tabela</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordenar</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished"></translation>
+        <translation>Perfil no topo</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished"></translation>
+        <translation>Notas no topo</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3651,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Editar</translation>
+        <translation>Editar</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">ar</translation>
+        <translation>ar</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Troca de emergência para OC</translation>
+        <translation>Troca de emergência para OC</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">iniciar</translation>
+        <translation>iniciar</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">fim</translation>
+        <translation>fim</translation>
     </message>
 </context>
 <context>
@@ -3739,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">desconhecido</translation>
+        <translation>desconhecido</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Garrafa</translation>
+        <translation>Garrafa</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Mistura de gás</translation>
+        <translation>Mistura de gás</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished">Gás usado</translation>
+        <translation>Gás usado</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Máx. CNS</translation>
+        <translation>Máx. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3802,50 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">AR</translation>
+        <translation>AR</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Encerrar</translation>
+        <translation>Encerrar</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Média</translation>
+        <translation>Média</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>Mínima</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Máxima</translation>
     </message>
 </context>
 <context>
@@ -3853,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Alterar numeração</translation>
+        <translation>Alterar numeração</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Novo número de início</translation>
+        <translation>Novo número de início</translation>
     </message>
 </context>
 <context>
@@ -3866,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3894,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Sobre Subsurface</translation>
+        <translation>Sobre Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3922,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Serviço web</translation>
+        <translation>Serviço web</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Erro de ligação:</translation>
+        <translation>Erro de ligação:</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Identificação de utilizador inválida !</translation>
+        <translation>Identificação de utilizador inválida !</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Não consigo analisar a resposta !</translation>
+        <translation>Não consigo analisar a resposta !</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Operação de transferência bem sucedida!</translation>
+        <translation>Operação de transferência bem sucedida!</translation>
     </message>
 </context>
 <context>
@@ -3960,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">Bar</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>Bar</translation>
     </message>
 </context>
 <context>
@@ -3991,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -4012,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation>ID do utilizador</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Palavra-passe</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4050,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Tipo</translation>
+        <translation>Tipo</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Peso</translation>
+        <translation>Peso</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4069,42 +2031,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4112,7 +2074,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4120,19 +2082,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4140,64 +2102,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">pascal</translation>
+        <translation>pascal</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">pés^3</translation>
+        <translation>pés^3</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">pés</translation>
+        <translation>pés</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">libra</translation>
+        <translation>libra</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) ou (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) ou (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4207,32 +2165,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">ar</translation>
+        <translation>ar</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">integrado</translation>
+        <translation>integrado</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">cinto</translation>
+        <translation>cinto</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">tornozelo</translation>
+        <translation>tornozelo</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">lastro no arnês</translation>
+        <translation>lastro no arnês</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">clip-on</translation>
+        <translation>clip-on</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4242,310 +2200,307 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Falha na leitura de &apos;%s&apos;</translation>
+        <translation>Falha na leitura de &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">nenhum</translation>
+        <translation>nenhum</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">paragem de deco</translation>
+        <translation>paragem de deco</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">rbt</translation>
+        <translation>rbt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">subida</translation>
+        <translation>subida</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">tecto</translation>
+        <translation>tecto</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">carga</translation>
+        <translation>carga</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">transmissor</translation>
+        <translation>transmissor</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">transgressão</translation>
+        <translation>transgressão</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">favorito</translation>
+        <translation>favorito</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">superfície</translation>
+        <translation>superfície</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">paragem de segurança</translation>
+        <translation>paragem de segurança</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">mudança de gás</translation>
+        <translation>mudança de gás</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">paragem de segurança (voluntária)</translation>
+        <translation>paragem de segurança (voluntária)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">paragem de segurança (obrigatória)</translation>
+        <translation>paragem de segurança (obrigatória)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">paragem de profundidade</translation>
+        <translation>paragem de profundidade</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">tecto (paragem de segurança)</translation>
+        <translation>tecto (paragem de segurança)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">duração do mergulho</translation>
+        <translation>duração do mergulho</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">Profundidade Máx</translation>
+        <translation>Profundidade Máx</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">OLF</translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">tempo de ar</translation>
+        <translation>tempo de ar</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">cabeçalho</translation>
+        <translation>cabeçalho</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">Alarme do nível nos tecidos</translation>
+        <translation>Alarme do nível nos tecidos</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">tempo sem paragem</translation>
+        <translation>tempo sem paragem</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">Número de evento inválido</translation>
+        <translation>Número de evento inválido</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Não é possivel criar o &quot;parser&quot; para %s %s</translation>
+        <translation>Não é possivel criar o &quot;parser&quot; para %s %s</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Erro no registo de dados</translation>
+        <translation>Erro no registo de dados</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Erro na análise da data</translation>
+        <translation>Erro na análise da data</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Mergulho #%d:%s %d %04d</translation>
+        <translation>Mergulho #%d:%s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Erro na análise do tempo de mergulho</translation>
+        <translation>Erro na análise do tempo de mergulho</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Erro na análise da profundidade máxima</translation>
+        <translation>Erro na análise da profundidade máxima</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Erro na análise na contagem da mistura de gás</translation>
+        <translation>Erro na análise na contagem da mistura de gás</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Erro na obtenção da salinidade da água.</translation>
+        <translation>Erro na obtenção da salinidade da água.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Erro na análise da mistura de gás</translation>
+        <translation>Erro na análise da mistura de gás</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Erro na análise das amostras</translation>
+        <translation>Erro na análise das amostras</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Evento: à espera de acção do utilizador</translation>
+        <translation>Evento: à espera de acção do utilizador</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x)</translation>
+        <translation>modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Erro no registo do &quot;event handler&quot;.</translation>
+        <translation>Erro no registo do &quot;event handler&quot;.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Erro no registo do &quot;cancellation handler&quot;.</translation>
+        <translation>Erro no registo do &quot;cancellation handler&quot;.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Erro na importação dos dados do mergulho</translation>
+        <translation>Erro na importação dos dados do mergulho</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">Não é possivel criar contexto do libdivecomputer</translation>
+        <translation>Não é possivel criar contexto do libdivecomputer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Não se consegue abrir  %s %s (%s)</translation>
+        <translation>Não se consegue abrir  %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Leitura de percentagens estranha %s
+
+</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Falha na análise de &apos;%s&apos;.
+        <translation>Falha na análise de &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Falha na análise de &apos;%s&apos;</translation>
+        <translation>Falha na análise de &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>A consulta &quot;obter eventos&quot; falhou.
+</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Falha na ligação à base de dados &apos;%s&apos;
+</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>A consulta da base de dados falhou &apos;%s&apos;.
+</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished"></translation>
+        <translation>Não é possível abrir a folha de estilos (%s)%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Não encontro o gás %d/%d</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Garrafa para planear</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Mergulho simulado</translation>
+        <translation>Não encontro o gás %d/%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">Demasiadas misturas de gás</translation>
+        <translation>Demasiadas misturas de gás</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4554,7 +2509,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Plano de mergulho Subsurface
 baseado em GFinferior = %.0f  y  GFsuperior = %.0f
 
@@ -4564,166 +2519,162 @@ baseado em GFinferior = %.0f  y  GFsuperior = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Transição de cota %.*f %s em %d:%02d min - runtime %d:%02u com %s
+        <translation>Transição de cota %.*f %s em %d:%02d min - runtime %d:%02u com %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Permanecer a  %.*f %s durante %d:%02d min - runtime %d:%02u a %s
+        <translation>Permanecer a  %.*f %s durante %d:%02d min - runtime %d:%02u a %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Alterar gás para %s
+        <translation>Alterar gás para %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Consumo de gás:
+        <translation>Consumo de gás:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s de %s
+        <translation>%.0f%s de %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">P:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 P:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Tecto calculado %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Paragem de segurança:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Paragem de segurança:tempo desconhecido @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deco:Tempo desconhecido @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Em deco</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
@@ -4732,7 +2683,7 @@ MOD:%d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 PEA:%d%s
 PNE:%d%s
 EADD:%d%s</translation>
@@ -4741,336 +2692,336 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished"></translation>
+        <translation>embarcação</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished"></translation>
+        <translation>costa</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished"></translation>
+        <translation>à deriva</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished"></translation>
+        <translation>fundo</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished"></translation>
+        <translation>caverna</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished"></translation>
+        <translation>gelo</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished"></translation>
+        <translation>naufrágio</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished"></translation>
+        <translation>gruta</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished"></translation>
+        <translation>altitude</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished"></translation>
+        <translation>piscina</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished"></translation>
+        <translation>lago</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished"></translation>
+        <translation>rio</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished"></translation>
+        <translation>nocturno</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished"></translation>
+        <translation>foto</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished"></translation>
+        <translation>vídeo</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">deco</translation>
+        <translation>deco</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">mais de %d dias</translation>
+        <translation>mais de %d dias</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dd, %dh %dmin</translation>
+        <translation>%dd, %dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dh %dmin</translation>
+        <translation>%dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">para mergulhos #</translation>
+        <translation>para mergulhos #</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">para mergulhos seleccionados</translation>
+        <translation>para mergulhos seleccionados</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">para mergulho #%d -</translation>
+        <translation>para mergulho #%d -</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">para mergulho seleccionado</translation>
+        <translation>para mergulho seleccionado</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">para todos os mergulhos</translation>
+        <translation>para todos os mergulhos</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(nenhum mergulho)</translation>
+        <translation>(nenhum mergulho)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">Dom</translation>
+        <translation>Dom</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">Seg</translation>
+        <translation>Seg</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">Ter</translation>
+        <translation>Ter</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">Qua</translation>
+        <translation>Qua</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">Qui</translation>
+        <translation>Qui</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">Sex</translation>
+        <translation>Sex</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">Sáb</translation>
+        <translation>Sáb</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">Jan</translation>
+        <translation>Jan</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">Feb</translation>
+        <translation>Feb</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">Mar</translation>
+        <translation>Mar</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">Abr</translation>
+        <translation>Abr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">Maio</translation>
+        <translation>Maio</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">Jun</translation>
+        <translation>Jun</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">Jul</translation>
+        <translation>Jul</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">Ago</translation>
+        <translation>Ago</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">Set</translation>
+        <translation>Set</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">Out</translation>
+        <translation>Out</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">Nov</translation>
+        <translation>Nov</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">Dez</translation>
+        <translation>Dez</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zurich: O sistema de ficheiros está quase cheio
+        <translation>Uemis Zurich: O sistema de ficheiros está quase cheio
 Desligue / religue o computador de mergulho
 e clique em &quot;Repetir&quot;</translation>
     </message>
@@ -5079,7 +3030,7 @@ e clique em &quot;Repetir&quot;</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zurich: sistema de ficheiros está cheio
+        <translation>Uemis Zurich: sistema de ficheiros está cheio
 Desligue / religue o computador de mergulho
 e tentar novamente</translation>
     </message>
@@ -5087,193 +3038,193 @@ e tentar novamente</translation>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Escrita do ficheiro req.txt curta.
+        <translation>Escrita do ficheiro req.txt curta.
 Está Uemis Zúrich correctamente ligado?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">desconhecido</translation>
+        <translation>desconhecido</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">A ler %s %s</translation>
+        <translation>A ler %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">dados</translation>
+        <translation>dados</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">identificador no diário de mergulho</translation>
+        <translation>identificador no diário de mergulho</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">identificação do local de mergulho</translation>
+        <translation>identificação do local de mergulho</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">mais dados do identificador de mergulho</translation>
+        <translation>mais dados do identificador de mergulho</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">fato húmido</translation>
+        <translation>fato húmido</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">semiseco</translation>
+        <translation>semiseco</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">fato seco</translation>
+        <translation>fato seco</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">shorty</translation>
+        <translation>shorty</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">camisola</translation>
+        <translation>camisola</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">long john</translation>
+        <translation>long john</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">colete</translation>
+        <translation>colete</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">fato completo</translation>
+        <translation>fato completo</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">Fato completo 2 peças</translation>
+        <translation>Fato completo 2 peças</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">membrana</translation>
+        <translation>membrana</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Iniciar Comunicação</translation>
+        <translation>Iniciar Comunicação</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Falha ao iniciar Uemis</translation>
+        <translation>Falha ao iniciar Uemis</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Começar transferência</translation>
+        <translation>Começar transferência</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Transgressão na paragem de segurança</translation>
+        <translation>Transgressão na paragem de segurança</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Alarme de Velocidade</translation>
+        <translation>Alarme de Velocidade</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Advertência de velocidade</translation>
+        <translation>Advertência de velocidade</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Aviso Verde PpO2</translation>
+        <translation>Aviso Verde PpO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Aviso de Ascenção PpO2</translation>
+        <translation>Aviso de Ascenção PpO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Alarme de Subida PpO2</translation>
+        <translation>Alarme de Subida PpO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Informação da pressão da garrafa</translation>
+        <translation>Informação da pressão da garrafa</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Aviso tempo de gás restante</translation>
+        <translation>Aviso tempo de gás restante</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Alerta de tempo de gás restante</translation>
+        <translation>Alerta de tempo de gás restante</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Sugestão de troca de garrafa</translation>
+        <translation>Sugestão de troca de garrafa</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Limite de profundidade ultrapassado</translation>
+        <translation>Limite de profundidade ultrapassado</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Advertência de tempo máx deco</translation>
+        <translation>Advertência de tempo máx deco</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Informação sobre a duração do mergulho</translation>
+        <translation>Informação sobre a duração do mergulho</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Alerta de duração de mergulho</translation>
+        <translation>Alerta de duração de mergulho</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Marcador</translation>
+        <translation>Marcador</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Sem dados registados da garrafa</translation>
+        <translation>Sem dados registados da garrafa</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Advertência de Bateria Baixa</translation>
+        <translation>Advertência de Bateria Baixa</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Alerta de Bateria Baixa</translation>
+        <translation>Alerta de Bateria Baixa</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index b57c38eb1..90f16ac9f 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -1,2389 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-Нет событий
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete">&gt; Месяц</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete">Загрузить</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete">Выберите модель компьютера и устройство.</translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> начало</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete"> конец</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">№</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/мин</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s %2$s, %4$d %3$s, %5$d   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %3$d %2$s %4$d    %5$d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s, %3$d %2$s %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %3$d %2$s %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d мин</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dд %dч %dмин</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dч %dмин</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-Расчетный потолок %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Деко:%uмин @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Деко:неизв. время @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-В деко</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL:%uмин</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-P:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Ост.безоп:%uмин @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Ост.безоп:неизв. время @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-План погружения Subsurface
-на основе значений нижний ГФ = %.0f и верхний ГФ = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe:%.2fбар</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s:%.2fбар</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s:%.2fбар</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s event at %d:%02u</source>
-        <translation type="obsolete">%s (событие в %d:%02u)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s: Response from divelogs.de</source>
-        <translation type="obsolete">%s: Ответ divelogs.de</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) или (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(нажмите для редактирования даты/времени)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(нажмите для редактирования даты/времени/глубины)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(нет погружений)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(отсутствует)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 куб.фут/мин</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 куб.фут/мин</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 л/мин</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 погр. на стр.</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">полный из 2-х</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 л/мин</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">3м шаг для расчетного потолка</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 погр. на стр.</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;Add segments below.
-Each line describes part of the planned dive.
-An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. &apos;+3:30&apos;) or ends at the given time (if absolute e.g &apos;@5:00&apos;, &apos;runtime&apos;), and uses the given gas.
-An empty gas means &apos;use previous gas&apos; (or AIR if no gas was specified).
-An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.
-CC SetPoint specifies CC (rebreather) dives, leave empty for OC.&lt;/small&gt;
-</source>
-        <translation type="obsolete">&lt;small&gt;Добавляйте сегменты ниже.
-Каждая строка - это часть планируемого погружения.
-Запись с глубиной, временем и смесью описывает сегмент, который заканчивается на заданной глубине, длится (указано относительное время, т.е. &apos;+3:30&apos;) либо заканчивается (указано абсолютное время, т.е. &apos;@5:00&apos;, &apos;runtime&apos;) в указанное время, и использует указанную смесь.
-Если смесь не указана, то будет использоваться предыдущая смесь (или воздух, если смесь не была задана).
-Строка с указанными глубиной и смесью, но без времени, - особая; она сообщает планировщику, что данная смесь доступна при подъеме по достижении указанной глубины.
-Настройка СС помечает погружения с ребризером, оставьте пустым для обычных погружений.&lt;/small&gt;
-</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">воздух</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">О Subsurface</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Добавить</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Добавить погружение...</translation>
-    </message>
-    <message>
-        <source>Add bookmark event here</source>
-        <translation type="obsolete">Добавить событие &quot;закладка&quot;</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Добавить погружение</translation>
-    </message>
-    <message>
-        <source>Add gas change event here</source>
-        <translation type="obsolete">Добавить событие &quot;замена смеси&quot;</translation>
-    </message>
-    <message>
-        <source>Add gaschange event at %d:%02u</source>
-        <translation type="obsolete">Добавить событие &quot;замена смеси&quot; в %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Добавить к поездке выше</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Добавить путевую точку</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Давл. возд.</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Темп. возд.</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Темп. воздуха в %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Приоритет загруженных погружений</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">Апр</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">Авг</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Автогруппировка</translation>
-    </message>
-    <message>
-        <source>Available gases</source>
-        <translation type="obsolete">Доступные смеси</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Средняя</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Средняя</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Среднее</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Средняя</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Ср. глуб.</translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Ср. глубина (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">Сред. SAC</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Ср. темп.</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Ср. время</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Переход на Откр. Цикл</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">Бар</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Партнер</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">Настройка СС</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Не найдена смесь %d/%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">Невозможно открыть файл преобразования (%s)/%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Отменено, выход...</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Отменено...</translation>
-    </message>
-    <message>
-        <source>Cannot add gas change</source>
-        <translation type="obsolete">Невозможно добавить &quot;замена смеси&quot;</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Невозможно разобрать ответ!</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Цельсий</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Выберите XML файл по умолчанию</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Выберите XML файлы для импорта в текущий файл данных</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Закрыть</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Свернуть все</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Соединение...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Ошибка соединения:</translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Создать поездку выше</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">куб. фут</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Баллон</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Баллон</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Баллон планировщика</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Баллоны</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">Г:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">ОТКАЗ ОТ ОТВЕТСТВЕННОСТИ / ВНИМАНИЕ: В ПЛАНИРОВЩИКЕ ИСПОЛЬЗУЕТСЯ НОВАЯ РЕАЛИЗАЦИЯ АЛГОРИТМА БЮЛЬМАНА, КОТОРАЯ БЫЛА НЕДОСТАТОЧНО ПРОТЕСТИРОВАНА. МЫ НАСТОЯТЕЛЬНО РЕКОМЕНДУЕМ НЕ ПЛАНИРОВАТЬ ПОГРУЖЕНИЯ ТОЛЬКО НА ОСНОВЕ ЭТИХ РЕЗУЛЬТАТОВ.</translation>
-    </message>
-    <message>
-        <source>Database connection failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Ошибка соединения с БД &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Ошибка запроса к БД &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query get_events failed.
-</source>
-        <translation type="obsolete">Ошибка запроса get_events в БД.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Дата</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Дата и время</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Дата:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">Дек</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">XML файл по умолчанию</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Удалить дайвкомпьютер</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Удалить погружение</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Удалить погружения</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Глуб.</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Превышен лимит глубины</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Глубина:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Идентификатор</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Устройство или точка монтирования</translation>
-    </message>
-    <message>
-        <source>Display invalid dives</source>
-        <translation type="obsolete">Показывать ошибочные погружения</translation>
-    </message>
-    <message>
-        <source>Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</source>
-        <extracomment>++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-&lt;trailing text&gt;
-</extracomment>
-        <translation type="obsolete">Погружение №%1$d - %2$s %4$02d.%3$02d.%5$04d в %6$d:%7$02d %8$s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Погр. №%d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Погружение %d: %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Название дайвкомпьютера</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Информация</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Погружение</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">План погружения - ЭТО ТОЛЬКО ИМИТАЦИЯ; НЕ ИСПОЛЬЗУЙТЕ ДЛЯ ПОГРУЖЕНИЯ</translation>
-    </message>
-    <message>
-        <source>Dive Tags</source>
-        <translation type="obsolete">Метки погружения</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Время погр.</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Тревога: время погружения</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Время погружения</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Производитель и модель</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Ошибка импорта данных погружения</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Места погружений</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Инструктор</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Начало погружения</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Погр#</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Шрифт списка</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Инструктор</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Погружения</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Места погружений</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Загрузка из дайвкомпьютера</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Загрузка из дайвкомпьютера...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Загрузка из вебсервиса</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Загрузка из вебсервиса...</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Успешная загрузка!</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Длительность</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Длительность (мин)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">В</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Редактировать</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Список дайвкомпьютеров</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Редактирование названий дайвкомпьютеров</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Редактирование поездки</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Краткие данные о поездке</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Чтобы редактировать название компьютера, дважды щелкните на нем мышью в поле названия</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Редактировать погружение</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Редактировать дату/время</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Редактировать погружения</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Множественное редактирование</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Редактировать данные поездки</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Показать / скрыть события</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Tags</source>
-        <translation type="obsolete">Показать / скрыть метки</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Конец</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Конечная глубина</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Введите идентификатор пользователя и нажмите &apos;Загрузить&apos;. По окончании загрузки вы можете нажать &apos;Применить&apos; чтобы внести изменения.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Снаряжение</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Ошибка</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Ошибка получения солености воды</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Ошибка разбора даты/времени</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Ошибка разбора времени погружения</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Ошибка разбора смеси</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Ошибка разбора счетчика смесей</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Ошибка разбора макс. глубины</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Ошибка разбора выборки</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Ошибка регистрации обработчика завершения.</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Ошибка регистрации данных</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Ошибка регистрации обработчика событий.</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Событие: сис.время=%&lt;PRId64&gt;, уст.время=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Событие: ожидание действия пользователя</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Развернуть все</translation>
-    </message>
-    <message>
-        <source>Export As UDDF File</source>
-        <translation type="obsolete">Экспортировать как файл UDDF</translation>
-    </message>
-    <message>
-        <source>Export UDDF...</source>
-        <translation type="obsolete">Экспорт UDDF...</translation>
-    </message>
-    <message>
-        <source>Export dive(s) to UDDF</source>
-        <translation type="obsolete">Экспорт погружения (-ий) в UDDF</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Фаренгейт</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Не получилось открыть %i файлов.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Ошибка разбора &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Ошибка разбора &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Ошибка чтения &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Ошибка чтения &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">Фев</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">Фут</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Файл</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Фильтр</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Принудительная загрузка всех погружений</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Птн</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">верхний ГФ</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">верхний ГФ для плана</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">нижний ГФ</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">нижний ГФ для плана</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (формат WGS84 или GPS)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Расход</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Расход</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Смесь</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Потребление смеси:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Смесь</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Общие настройки</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Справка</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">Простаивает</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Импорт файлов...</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Информация</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Инициализация связи</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Ввести план</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Ошибка разбора глубины &quot;%s&quot;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Ошибка - глубины более 400м не поддерживаются</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Неверная смесь в строке %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Неверное время старта</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Неверный идентификатор пользователя!</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Янв</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">Июл</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">Июн</translation>
-    </message>
-    <message>
-        <source>Last stop at 20 Feet</source>
-        <translation type="obsolete">Последняя остановка на 20 футах</translation>
-    </message>
-    <message>
-        <source>Last stop at 6 Meters</source>
-        <translation type="obsolete">Последняя остановка на 6 метрах</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Параметры макета</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Линус Торвальдс, Дирк Хондел и другие, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Список</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">Литр</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Местонахождение</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Журнал</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Максимум</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Самый долгий</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Тревога: заряд батареи</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Внимание: заряд батареи</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Поставщик карт</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">Мар</translation>
-    </message>
-    <message>
-        <source>Mark invalid</source>
-        <translation type="obsolete">Пометить как ошибочное</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Пометить точку здесь</translation>
-    </message>
-    <message>
-        <source>Mark valid</source>
-        <translation type="obsolete">Пометить как верное</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Метка</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Инструктор</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Внимание: макс. время деко</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Макс. глуб.</translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Макс. глубина (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Макс. SAC</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Макс. темп.</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Макс. глубина: %.*f %s
-Длительность: %d мин
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Макс. CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Макс. давл.</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Максимум</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Максимум</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Максимум</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">Май</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Объединить погружения</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Объединить с поездкой выше</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Объединить с поездкой ниже</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">Метр</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Мин. глуб.</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Мин. SAC</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Мин. темп.</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Минимум</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Минимум</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Минимум</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Прочие настройки</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Модель</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Пнд</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Кроссплатформенный журнал погружений</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">С</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Новый</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Начать нумерацию с</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">След. ДК</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Имя устройства</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Нет данных о баллоне</translation>
-    </message>
-    <message>
-        <source>No cylinders listed for this dive.</source>
-        <translation type="obsolete">Для этого погружения не указаны баллоны.</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Примечания</translation>
-    </message>
-    <message>
-        <source>Notes height (%d%% - %d%%)</source>
-        <translation type="obsolete">Высота примечаний (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Примечания наверху</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">Ноя</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">OLF</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">Окт</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Необычная ошибка возврата pthread</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Удалить выбранную запись?</translation>
-    </message>
-    <message>
-        <source>Only display dives with these tags:</source>
-        <translation type="obsolete">Показывать только погружения с метками:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Открыть файл</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Открыть...</translation>
-    </message>
-    <message>
-        <source>Ordering</source>
-        <translation type="obsolete">Макет страницы</translation>
-    </message>
-    <message>
-        <source>Other data height (%d%% - %d%%)</source>
-        <translation type="obsolete">Высота прочих данных (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Кислород</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Тревога: PO2 при подъеме</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Внимание: PO2 при подъеме</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Внимание: PO2 (зеленый)</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">PSI</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Пароль</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Выбрать на карте</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Планировщик</translation>
-    </message>
-    <message>
-        <source>Please enter your userid and password for divelogs.de. The selected dives will be added to your account</source>
-        <translation type="obsolete">Укажите свой логин и пароль для divelogs.de. Выбранные погружения будут добавлены к вашей учетной записи.</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Предпочтения</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Предпочтения...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Давление</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Давление:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Пред. ДК</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">Цветная печать</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Печать выбранных погружений</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Печать выделенных</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Настройки печати</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Печать...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Профиль</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Настройки профиля</translation>
-    </message>
-    <message>
-        <source>Profile height (%d%% - %d%%)</source>
-        <translation type="obsolete">Высота профиля (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Профиль наверху</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Выход</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Тревога: RGT</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Внимание: RGT</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Оценка</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Чтение %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Удалить</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Удалить поездку</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Удалить из поездки</translation>
-    </message>
-    <message>
-        <source>Remove event here</source>
-        <translation type="obsolete">Удалить событие здесь</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Удалить выделенные из поездки</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Перенумеровать</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Перенумеровать...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Повторить</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">Ю</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">SAC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">SAC при декостоп</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">SAC при погружении</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Нарушение остановки безопасности</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Суб</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Сохранить как...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Сохранить изменения?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Сохранить файл как</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Сохранить как</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Сохранить...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Время сегмента</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Выбрать события</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Выбрать события...</translation>
-    </message>
-    <message>
-        <source>Select Tags...</source>
-        <translation type="obsolete">Выбрать метки...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">Снт</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Прервана запись в файл req.txt
-Проверьте подключение Uemis Zurich.</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Минимум</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Самый короткий</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Показать колонки</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">Показать EAD, END, EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">Показать MOD</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Показать расчетный потолок</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Показать потолок компьютера красным</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Показать на карте</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">График pHe</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">График pN%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">График pO%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Моделирование погружения</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Объем</translation>
-    </message>
-    <message>
-        <source>Sizing heights (%% of layout)</source>
-        <translation type="obsolete">Высота областей (%% oт макета)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Тревога: скорость</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Внимание: скорость</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Начало</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Начать загрузку</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Статистика</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Статистика %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Статистика</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Состояние</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Оставаться на %.*f %s в течение %d:%02d мин - рантайм %d:%02u на смеси %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Странное значение процентов %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Костюм</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Вск</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Пов. инт.</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Давление на поверхности (мбар)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Замена смеси на %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Таблица</translation>
-    </message>
-    <message>
-        <source>Tags are only shown if they are identical for all edited dives</source>
-        <translation type="obsolete">Метки отображаются только если они одинаковые для всех редактируемых погружений</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Предложена смена баллона</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Давление в баллоне</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Техн. настройки</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Темп.</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Температура</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Температура:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Три панели</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Чтв</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Время</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Для редактирования погружения
-дважды щелкните мышью на нем в списке</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Изменить масштаб</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">Слишком много смесей</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">Слишком много путевых точек</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Общая</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Общее время</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Общий вес:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Переход на %.*f %s за %d:%02d мин - рантайм %d:%02u на смеси %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Поездка %1$s, %3$d %2$s %4$d (%5$d погружение)</numerusform>
-            <numerusform>Поездка %1$s, %3$d %2$s %4$d (%5$d погружения)</numerusform>
-            <numerusform>Trip %1$s, %3$d %2$s %4$d (%5$d погружений)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Втр</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Тип</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zurich: Файловая система почти заполнена
-Отсоедините и подключите дайв-компьютер
-и нажмите &quot;Повторить&quot;</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zurich: Файловая система заполнена
-Отсоедините и подключите дайв-компьютер
-и попробуйте заново</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Ошибка инициализации Uemis</translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">Невозможно создать контекст libdivecomputer</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Невозможно создать анализатор для %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Невозможно открыть %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Единицы</translation>
-    </message>
-    <message>
-        <source>Upload dive(s) to divelogs.de</source>
-        <translation type="obsolete">Выгрузить погружение (-я) на divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de</source>
-        <translation type="obsolete">Выгрузить на divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de...</source>
-        <translation type="obsolete">Выгрузить на divelogs.de...</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Для отметки нажмите правую кнопку мыши</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Идентификатор пользователя</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Руководство пользователя</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Вид</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Видимость</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Объем:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">З</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Внимание - расчет очень долгих погружений может занять много времени</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Внимание - расчет очень глубоких погружений может занять много времени</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Темп. воды</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Вебсервис</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Срд</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Груз</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Грузовая система</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Вес:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">XML файл</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Год</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Статистика за год</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">У вас уже есть дайвкомпьютер этой модели,
-который называется %s.Subsurface позволяет именовать компьютеры чтобы различать их. По умолчанию это модель и идентификатор, указанные ниже.
-Если вы не хотите именовать этот компьютер, нажмите &apos;Отмена&apos; и Subsurface будет показывать его модель вместо имени (и вы не сможете отличить их друг от друга в журналах).</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">У вас есть несохраненные изменения.
-Хотите ли вы их сохранить перед закрытием журнала?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">У вас есть несохраненные изменения в файле %s.
-Хотите ли вы их сохранить перед закрытием журнала?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">воздух</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">оставшееся время по воздуху</translation>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">высокогорье</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">груз на ноги</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">подъем</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">груз на пластину</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">Бар</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">пояс</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">с лодки</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">закладка</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">пещера</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">каверна</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">потолок</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">потолок (остановка безопасности)</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">карабины</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">куб. фут</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">данные</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">деко стоп</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">деко стоп</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">глубокое</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">глубокая остановка</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">ид. записи журнала</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">ид. места погружения</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">время погружения</translation>
-    </message>
-    <message>
-        <source>drift</source>
-        <translation type="obsolete">течение</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">сухой</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">для всех погружений</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">для погружения №%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">для погружений №</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">для выбранного погружения</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">для выбранных погружений</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">в пресной воде</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">фут</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">полный</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">замена смеси</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">направление</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">подледное</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">интегрированный</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">ошибочное</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">неверный номер события</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">куртка</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">кг</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">л</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">в озере</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">фунт</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">комбинезон</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">м</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">макс. ppO2</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">макс.CNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">макс. глуб.</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">мембрана</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">мин</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">ид. дополнительных данных погружения</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">более %d дней</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">ночное</translation>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">время без остановки</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">отсутствует</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">порог pHe</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">порог pN%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">порог pO%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">Па</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">фото</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">бассейн</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">оставшееся время на дне</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">в реке</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">остановка безопасности</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">остановка безопасности (обязательно)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">остановка безопасности (добровольно)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">полусухой</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">с берега</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">короткий</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">поверхность</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">обучение</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">насыщение тканей</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">тренировка</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">Sergey Starosek</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">передатчик</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">неизв</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">неизвестно</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">не указано</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">жилет</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">видео</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">нарушение</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">вес</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">мокрый</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">нагрузка</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">рэк</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru_RU" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation>Файл CSV</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Разделитель</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Положение полей</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Время</translation>
+        <translation>Время</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Глуб.</translation>
+        <translation>Глуб.</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Темп.</translation>
+        <translation>Темп.</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation>Шаблоны</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2391,57 +77,57 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Тип</translation>
+        <translation>Тип</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Объем</translation>
+        <translation>Объем</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Раб.давл.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Нач.давл.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Кон.давл.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation>O2%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation>HE</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2449,41 +135,41 @@ tranlators here
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Редактирование названий дайвкомпьютеров</translation>
+        <translation>Редактирование названий дайвкомпьютеров</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Модель</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Модель</translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Имя устройства</translation>
+        <translation>Имя устройства</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2491,12 +177,12 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation>л/мин</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2504,95 +190,87 @@ tranlators here
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Объединить с поездкой выше</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Объединить с поездкой ниже</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2600,48 +278,48 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2649,23 +327,23 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation>10м</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation>30фут</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2673,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">воздух</translation>
+        <translation>воздух</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Длительность</translation>
+        <translation>Длительность</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2711,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2729,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">№</translation>
+        <translation>№</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Дата</translation>
+        <translation>Дата</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">м</translation>
+        <translation>м</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">фут</translation>
+        <translation>фут</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">мин</translation>
+        <translation>мин</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">кг</translation>
+        <translation>кг</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">фунт</translation>
+        <translation>фунт</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Костюм</translation>
+        <translation>Костюм</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Баллон</translation>
+        <translation>Баллон</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">макс.CNS</translation>
+        <translation>макс.CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Местонахождение</translation>
+        <translation>Местонахождение</translation>
     </message>
 </context>
 <context>
@@ -2798,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
+        <translation>Ошибка</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Повторить</translation>
+        <translation>Повторить</translation>
     </message>
 </context>
 <context>
@@ -2816,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Загрузка из дайвкомпьютера</translation>
+        <translation>Загрузка из компьютера</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation>Производитель</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Модель компьютера</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation>Устройство или точка монтирования</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Принудительная загрузка всех погружений</translation>
+        <translation>Принудительная загрузка всех погружений</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation>Предпочтение загруженным</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2864,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Погружение</translation>
+        <translation>Погружение</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation>Начало</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation>Температура воздуха / воды</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Местонахождение</translation>
+        <translation>Местонахождение</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation>Координаты</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Инструктор</translation>
+        <translation>Инструктор</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Партнер</translation>
+        <translation>Партнер</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation>Метки</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Оценка</translation>
+        <translation>Оценка</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Видимость</translation>
+        <translation>Видимость</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Костюм</translation>
+        <translation>Костюм</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Примечания</translation>
+        <translation>Примечания</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Снаряжение</translation>
+        <translation>Снаряжение</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Информация</translation>
+        <translation>Информация</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Дата</translation>
+        <translation>Дата</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation>Интервал</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Макс. глубина</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Ср. глубина</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Давление воздуха</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Температура воздуха</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Температура воды</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Время погр.</translation>
+        <translation>Время погр.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Статистика</translation>
+        <translation>Статистика</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Глуб.</translation>
+        <translation>Глуб.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Температура</translation>
+        <translation>Температура</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Длительность</translation>
+        <translation>Длительность</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Общее время</translation>
+        <translation>Общее время</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Погружения</translation>
+        <translation>Погружения</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Баллоны</translation>
+        <translation>Баллоны</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить баллон</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation>Грузы</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить груз</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -3091,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation>/мин</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">неизвестно</translation>
+        <translation>неизвестно</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">С</translation>
+        <translation>С</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">Ю</translation>
+        <translation>Ю</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">В</translation>
+        <translation>В</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">З</translation>
+        <translation>З</translation>
     </message>
 </context>
 <context>
@@ -3124,417 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Файл</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Журнал</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Вид</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Фильтр</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Справка</translation>
+        <translation>Фильтр</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>Файл</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation>Журнал</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation>Вид</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Помощь</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation>Импорт</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Новый журнал</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Новый</translation>
+        <translation>Новый</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть журнал</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Сохранить как</translation>
+        <translation>Сохранить как</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Закрыть</translation>
+        <translation>Закрыть</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Импорт файлов</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation>Экспорт UDDF</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation>Печать</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>Выход</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Импорт из компьютера</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation>Импорт данных GPS из сервиса Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation>Статистика за год</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Профиль</translation>
+        <translation>Профиль</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Информация</translation>
+        <translation>Информация</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>Руководство</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation>Планировщик</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation>Импорт CSV</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation>Импорт CSV</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation>Импорт с сайта Divelogs.de</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Предпочтения</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Выход</translation>
+        <translation>Предпочтения</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Список дайвкомпьютеров</translation>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Перенумеровать</translation>
+        <translation>Добавить погружение</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Изменить масштаб</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Статистика за год</translation>
+        <translation>Авто-группировка</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+2</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+3</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+4</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Пред. ДК</translation>
+        <translation>Пред. ДК</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Влево</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">След. ДК</translation>
+        <translation>След. ДК</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Вправо</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Выбрать события</translation>
+        <translation>Выбрать события</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Ввести план</translation>
+        <translation>Ввести план</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">О Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Руководство пользователя</translation>
+        <translation>О Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation>F1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+5</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Открыть файл</translation>
+        <translation>Открыть файл</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить изменения в файле %1?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить изменения в файле журнала?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Сохранить изменения?</translation>
+        <translation>Сохранить изменения?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3544,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3562,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Общие</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Единицы</translation>
+        <translation>Единицы</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation>Профиль</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation>Списки и таблицы</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Шрифт</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation>Размер шрифта</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Погружения</translation>
+        <translation>Погружения</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation>Журнал по умолчанию</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>Показывать ошибочные</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Баллон по умолчанию</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Использовать</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation>Система мер</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation>Метрическая</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation>Имперская</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation>Настроить</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Глуб.</translation>
+        <translation>Глубина</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">Метр</translation>
+        <translation>метр</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">Фут</translation>
+        <translation>фут</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Давление</translation>
+        <translation>Давление</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">Бар</translation>
+        <translation>бар</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation>Psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Объем</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">Литр</translation>
+        <translation>литр</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">куб. фут</translation>
+        <translation>куб. фут</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Температура</translation>
+        <translation>Температура</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Цельсий</translation>
+        <translation>Цельсий</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Фаренгейт</translation>
+        <translation>Фаренгейт</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Груз</translation>
+        <translation>Вес</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation>кг</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">фунт</translation>
+        <translation>фунт</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation>Единицы времени</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation>Делитель скорости спуска/подъема</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>Минуты</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Секунды</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Показывать</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation>pO2</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation>порог</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation>pN2</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation>pHe</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation>MOD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation>макс PP02</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation>EAD END EADD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation>Потолок компьютера</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation>потолок красным</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation>Расчётный потолок</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation>все ткани</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation>шаг 3м</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation>Рассчитывать NDL/TTS</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation>GFLow на макс. грубине</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Разное</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation>Журнал по умолчанию</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3852,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation>Печать</translation>
     </message>
 </context>
 <context>
@@ -3860,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Погр#</translation>
+        <translation>Погр#</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Дата</translation>
+        <translation>Дата</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Глуб.</translation>
+        <translation>Глуб.</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Длительность</translation>
+        <translation>Длительность</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Инструктор</translation>
+        <translation>Инструктор</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Партнер</translation>
+        <translation>Партнер</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Местонахождение</translation>
+        <translation>Местонахождение</translation>
     </message>
 </context>
 <context>
@@ -3898,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation>Параметры печати</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Печать выбранных погружений</translation>
+        <translation>Печать выбранных погружений</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">Цветная печать</translation>
+        <translation>Цветная печать</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Настройки печати</translation>
+        <translation>Настройки печати</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 погр. на стр.</translation>
+        <translation>6 погр. на стр.</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 погр. на стр.</translation>
+        <translation>2 погр. на стр.</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Таблица</translation>
+        <translation>Таблица</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished">Макет страницы</translation>
+        <translation>Макет страницы</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Профиль наверху</translation>
+        <translation>Профиль наверху</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Примечания наверху</translation>
+        <translation>Примечания наверху</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation>Высота элементов (% от макета)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Профиль (43% - 85%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Прочее (8% - 17%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Заметки (0% - 52%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3983,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation>Спрятать события</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить выбранное событие?</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Редактировать</translation>
+        <translation>Редактировать</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">воздух</translation>
+        <translation>воздух</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation>EAN%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Переход на Откр. Цикл</translation>
+        <translation>Переход на Откр. Цикл</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> начало</translation>
+        <translation> начало</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished"> конец</translation>
+        <translation> конец</translation>
     </message>
 </context>
 <context>
@@ -4071,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">неизвестно</translation>
+        <translation>неизвестно</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Макс. глубина: %1 %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation>Длительность: %1 мин</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Баллон</translation>
+        <translation>Баллон</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Смесь</translation>
+        <translation>Смесь</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Смесь</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Макс. CNS</translation>
+        <translation>Макс. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation>Грузы</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation>Общий вес</translation>
     </message>
 </context>
 <context>
@@ -4134,50 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">воздух</translation>
+        <translation>воздух</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Закрыть</translation>
+        <translation>Закрыть</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Средняя</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished">Минимум</translation>
+        <translation>Минимум</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished">Максимум</translation>
+        <translation>Максимум</translation>
     </message>
 </context>
 <context>
@@ -4185,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Перенумеровать</translation>
+        <translation>Перенумеровать</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Начать нумерацию с</translation>
+        <translation>Начать нумерацию с</translation>
     </message>
 </context>
 <context>
@@ -4198,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4226,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">О Subsurface</translation>
+        <translation>О Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation>Лицензия</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation>Веб-сайт</translation>
     </message>
 </context>
 <context>
@@ -4254,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Вебсервис</translation>
+        <translation>Вебсервис</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузка завершена</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Ошибка соединения:</translation>
+        <translation>Ошибка соединения:</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Неверный идентификатор пользователя!</translation>
+        <translation>Неверный идентификатор пользователя!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Невозможно разобрать ответ!</translation>
+        <translation>Невозможно разобрать ответ!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Успешная загрузка!</translation>
+        <translation>Успешная загрузка!</translation>
     </message>
 </context>
 <context>
@@ -4292,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить баллон</translation>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">Бар</translation>
+        <source>Description</source>
+        <translation>Описание</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>Бар</translation>
     </message>
 </context>
 <context>
@@ -4323,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Информация</translation>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">кг</translation>
+        <source>Description</source>
+        <translation>Описание</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>кг</translation>
     </message>
 </context>
 <context>
@@ -4344,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузить данные местоположения</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation>Состояние:</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузить</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation>ID пользователя</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Пароль</translation>
+        <translation>Пароль</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation>Выгрузить</translation>
     </message>
 </context>
 <context>
@@ -4382,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Тип</translation>
+        <translation>Тип</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Груз</translation>
+        <translation>Груз</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4401,42 +2031,45 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">№</translation>
+        <translation>№</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation>Длительность
+Общее</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Среднее</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Глубина (%1)
+Среднее</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4444,7 +2077,8 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Минимум</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4452,19 +2086,22 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Максимум</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>SAC (%1)
+Среднее</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Темп. (%1)
+Среднее</translation>
     </message>
 </context>
 <context>
@@ -4472,64 +2109,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">Па</translation>
+        <translation>Па</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">Бар</translation>
+        <translation>Бар</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">л</translation>
+        <translation>л</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">куб. фут</translation>
+        <translation>куб. фут</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">м</translation>
+        <translation>м</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">фут</translation>
+        <translation>фут</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">фунт</translation>
+        <translation>фунт</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">кг</translation>
+        <translation>кг</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) или (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s, %3$d %2$s %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) или (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4539,32 +2172,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">воздух</translation>
+        <translation>воздух</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">интегрированный</translation>
+        <translation>интегрированный</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">пояс</translation>
+        <translation>пояс</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">груз на ноги</translation>
+        <translation>груз на ноги</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">груз на пластину</translation>
+        <translation>груз на пластину</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">карабины</translation>
+        <translation>карабины</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4574,314 +2207,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Ошибка чтения &apos;%s&apos;</translation>
+        <translation>Ошибка чтения &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ошибка чтения &apos;%s&apos;. Используйте импорт CSV.</translation>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation>Для импорта CSV максимально допустимое кол-во колонок %d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">отсутствует</translation>
+        <translation>отсутствует</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">деко стоп</translation>
+        <translation>деко стоп</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">оставшееся время на дне</translation>
+        <translation>оставшееся время на дне</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">подъем</translation>
+        <translation>подъем</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">потолок</translation>
+        <translation>потолок</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">нагрузка</translation>
+        <translation>нагрузка</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">передатчик</translation>
+        <translation>передатчик</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">нарушение</translation>
+        <translation>нарушение</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">закладка</translation>
+        <translation>закладка</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">поверхность</translation>
+        <translation>поверхность</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">остановка безопасности</translation>
+        <translation>остановка безопасности</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">замена смеси</translation>
+        <translation>замена смеси</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">остановка безопасности (добровольно)</translation>
+        <translation>остановка безопасности (добровольно)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">остановка безопасности (обязательно)</translation>
+        <translation>остановка безопасности (обязательно)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">глубокая остановка</translation>
+        <translation>глубокая остановка</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">потолок (остановка безопасности)</translation>
+        <translation>потолок (остановка безопасности)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">время погружения</translation>
+        <translation>время погружения</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">макс. глуб.</translation>
+        <translation>макс. глуб.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">OLF</translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">оставшееся время по воздуху</translation>
+        <translation>оставшееся время по воздуху</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">направление</translation>
+        <translation>направление</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">насыщение тканей</translation>
+        <translation>насыщение тканей</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">время без остановки</translation>
+        <translation>время без остановки</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">неверный номер события</translation>
+        <translation>неверный номер события</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Невозможно создать анализатор для %s %s</translation>
+        <translation>Невозможно создать анализатор для %s %s</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Ошибка регистрации данных</translation>
+        <translation>Ошибка регистрации данных</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Ошибка разбора даты/времени</translation>
+        <translation>Ошибка разбора даты/времени</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Погружение %d: %s %d %04d</translation>
+        <translation>Погружение %d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Ошибка разбора времени погружения</translation>
+        <translation>Ошибка разбора времени погружения</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Ошибка разбора макс. глубины</translation>
+        <translation>Ошибка разбора макс. глубины</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Ошибка разбора счетчика смесей</translation>
+        <translation>Ошибка разбора счетчика смесей</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Ошибка получения солености воды</translation>
+        <translation>Ошибка получения солености воды</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Ошибка получения давления на поверхности</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Ошибка разбора смеси</translation>
+        <translation>Ошибка разбора смеси</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Ошибка разбора выборки</translation>
+        <translation>Ошибка разбора выборки</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Событие: ожидание действия пользователя</translation>
+        <translation>Событие: ожидание действия пользователя</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)</translation>
+        <translation>модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Ошибка регистрации обработчика событий.</translation>
+        <translation>Ошибка регистрации обработчика событий.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Ошибка регистрации обработчика завершения.</translation>
+        <translation>Ошибка регистрации обработчика завершения.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Ошибка импорта данных погружения</translation>
+        <translation>Ошибка импорта данных погружения</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">Невозможно создать контекст libdivecomputer</translation>
+        <translation>Невозможно создать контекст libdivecomputer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Невозможно открыть %s %s (%s)</translation>
+        <translation>Невозможно открыть %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Странное значение процентов %s
+        <translation>Странное значение процентов %s
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Ошибка разбора &apos;%s&apos;.
+        <translation>Ошибка разбора &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Ошибка разбора &apos;%s&apos;</translation>
+        <translation>Ошибка разбора &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished">Ошибка запроса get_events в БД.
+        <translation>Ошибка запроса get_events в БД.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished">Ошибка соединения с БД &apos;%s&apos;.
+        <translation>Ошибка соединения с БД &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished">Ошибка запроса к БД &apos;%s&apos;.
+        <translation>Ошибка запроса к БД &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">Невозможно открыть файл преобразования (%s)/%s</translation>
+        <translation>Невозможно открыть файл преобразования (%s)/%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Не найдена смесь %d/%d</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Баллон планировщика</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Моделирование погружения</translation>
+        <translation>Не найдена смесь %d/%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">Слишком много смесей</translation>
+        <translation>Слишком много смесей</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4890,7 +2515,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 План погружения Subsurface
 на основе значений нижний ГФ = %.0f и верхний ГФ = %.0f
 
@@ -4900,166 +2525,162 @@ based on GFlow = %.0f and GFhigh = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Переход на %.*f %s за %d:%02d мин - рантайм %d:%02u на смеси %s
+        <translation>Переход на %.*f %s за %d:%02d мин - рантайм %d:%02u на смеси %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Оставаться на %.*f %s в течение %d:%02d мин - рантайм %d:%02u на смеси %s
+        <translation>Оставаться на %.*f %s в течение %d:%02d мин - рантайм %d:%02u на смеси %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Замена смеси на %s
+        <translation>Замена смеси на %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Потребление смеси:
+        <translation>Потребление смеси:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s %s
+        <translation>%.0f%s %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">Г:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 P:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Расчетный потолок %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Ост.безоп:%uмин @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Ост.безоп:неизв. время @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Деко:%uмин @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Деко:неизв. время @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 В деко</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL:%uмин</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s:%.2fбар</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s:%.2fбар</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe:%.2fбар</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
@@ -5068,7 +2689,7 @@ MOD:%d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 EAD:%d%s
 END:%d%s
 EADD:%d%s</translation>
@@ -5077,352 +2698,336 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation>C</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation>F</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">ошибочное</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">с лодки</translation>
+        <translation>с лодки</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">с берега</translation>
+        <translation>с берега</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished">течение</translation>
+        <translation>течение</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">глубокое</translation>
+        <translation>глубокое</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">каверна</translation>
+        <translation>каверна</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">подледное</translation>
+        <translation>подледное</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">рэк</translation>
+        <translation>рэк</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">пещера</translation>
+        <translation>пещера</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">высокогорье</translation>
+        <translation>высокогорье</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">бассейн</translation>
+        <translation>бассейн</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">в озере</translation>
+        <translation>в озере</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">в реке</translation>
+        <translation>в реке</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">ночное</translation>
+        <translation>ночное</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation>пресная</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">в пресной воде</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">тренировка</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">обучение</translation>
+        <translation>ученик</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">фото</translation>
+        <translation>фото</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">видео</translation>
+        <translation>видео</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation>инструктор</translation>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">деко стоп</translation>
+        <translation>деко стоп</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">более %d дней</translation>
+        <translation>более %d дней</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dд %dч %dмин</translation>
+        <translation>%dд %dч %dмин</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dч %dмин</translation>
+        <translation>%dч %dмин</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">для погружений №</translation>
+        <translation>для погружений №</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">для выбранных погружений</translation>
+        <translation>для выбранных погружений</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">для погружения №%d</translation>
+        <translation>для погружения №%d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">для выбранного погружения</translation>
+        <translation>для выбранного погружения</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">для всех погружений</translation>
+        <translation>для всех погружений</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(нет погружений)</translation>
+        <translation>(нет погружений)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">Вск</translation>
+        <translation>Вск</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">Пнд</translation>
+        <translation>Пнд</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">Втр</translation>
+        <translation>Втр</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">Срд</translation>
+        <translation>Срд</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">Чтв</translation>
+        <translation>Чтв</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">Птн</translation>
+        <translation>Птн</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">Суб</translation>
+        <translation>Суб</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">Янв</translation>
+        <translation>Янв</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">Фев</translation>
+        <translation>Фев</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">Мар</translation>
+        <translation>Мар</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">Апр</translation>
+        <translation>Апр</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">Май</translation>
+        <translation>Май</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">Июн</translation>
+        <translation>Июн</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">Июл</translation>
+        <translation>Июл</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">Авг</translation>
+        <translation>Авг</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">Снт</translation>
+        <translation>Снт</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">Окт</translation>
+        <translation>Окт</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">Ноя</translation>
+        <translation>Ноя</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">Дек</translation>
+        <translation>Дек</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zurich: Файловая система почти заполнена
+        <translation>Uemis Zurich: Файловая система почти заполнена
 Отсоедините и подключите дайв-компьютер
 и нажмите &quot;Повторить&quot;</translation>
     </message>
@@ -5431,7 +3036,7 @@ and click &apos;Retry&apos;</source>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zurich: Файловая система заполнена
+        <translation>Uemis Zurich: Файловая система заполнена
 Отсоедините и подключите дайв-компьютер
 и попробуйте заново</translation>
     </message>
@@ -5439,193 +3044,193 @@ and try again</source>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Прервана запись в файл req.txt
+        <translation>Прервана запись в файл req.txt
 Проверьте подключение Uemis Zurich.</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">неизвестно</translation>
+        <translation>неизвестно</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Чтение %s %s</translation>
+        <translation>Чтение %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">данные</translation>
+        <translation>данные</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">ид. записи журнала</translation>
+        <translation>ид. записи журнала</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">ид. места погружения</translation>
+        <translation>ид. места погружения</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">ид. дополнительных данных погружения</translation>
+        <translation>ид. дополнительных данных погружения</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">мокрый</translation>
+        <translation>мокрый</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">полусухой</translation>
+        <translation>полусухой</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">сухой</translation>
+        <translation>сухой</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">короткий</translation>
+        <translation>короткий</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">жилет</translation>
+        <translation>жилет</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">комбинезон</translation>
+        <translation>комбинезон</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">куртка</translation>
+        <translation>куртка</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">полный</translation>
+        <translation>полный</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">полный из 2-х</translation>
+        <translation>полный из 2-х</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">мембрана</translation>
+        <translation>мембрана</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Инициализация связи</translation>
+        <translation>Инициализация связи</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Ошибка инициализации Uemis</translation>
+        <translation>Ошибка инициализации Uemis</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Начать загрузку</translation>
+        <translation>Начать загрузку</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Нарушение остановки безопасности</translation>
+        <translation>Нарушение остановки безопасности</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Тревога: скорость</translation>
+        <translation>Тревога: скорость</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Внимание: скорость</translation>
+        <translation>Внимание: скорость</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Внимание: PO2 (зеленый)</translation>
+        <translation>Внимание: PO2 (зеленый)</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Внимание: PO2 при подъеме</translation>
+        <translation>Внимание: PO2 при подъеме</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Тревога: PO2 при подъеме</translation>
+        <translation>Тревога: PO2 при подъеме</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Давление в баллоне</translation>
+        <translation>Давление в баллоне</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Внимание: RGT</translation>
+        <translation>Внимание: RGT</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Тревога: RGT</translation>
+        <translation>Тревога: RGT</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Предложена смена баллона</translation>
+        <translation>Предложена смена баллона</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Превышен лимит глубины</translation>
+        <translation>Превышен лимит глубины</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Внимание: макс. время деко</translation>
+        <translation>Внимание: макс. время деко</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Время погружения</translation>
+        <translation>Время погружения</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Тревога: время погружения</translation>
+        <translation>Тревога: время погружения</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Метка</translation>
+        <translation>Метка</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Нет данных о баллоне</translation>
+        <translation>Нет данных о баллоне</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Внимание: заряд батареи</translation>
+        <translation>Внимание: заряд батареи</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Тревога: заряд батареи</translation>
+        <translation>Тревога: заряд батареи</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts
index 2aca2e13f..f5eaf2409 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -1,2386 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="sk_SK">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-Bez záznamov
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete"> &gt; Mesiac</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete">Načítať</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete">Voľba typu počítača a zariadenia. </translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">začiatok</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">koniec</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">#</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s z %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dd %dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dh %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-Vypočítaná hladina %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deco:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deco:nezn. čas @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-In deco</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL:%umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-P:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Bezpečnostná zastávka:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Bezpečnostná zastávka:nezn. čas @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Subsurface plan ponoru
-zrátaný s  GFlow = %.0f a GFhigh = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s event at %d:%02u</source>
-        <translation type="obsolete">%s udalosť o %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s: Response from divelogs.de</source>
-        <translation type="obsolete">%s: Odpoveď z </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) alebo (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(klikni na zmenu dátumu/času)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(klikni na zmenu dátumu/času/hĺbky)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(žiadné ponory)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(nič)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 kubst/min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 kubst/min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 l/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 ponory na stránku</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">2 dielny oblek</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 l/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">3m krok pre výpočet hladiny</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 ponorov na stránku</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;Add segments below.
-Each line describes part of the planned dive.
-An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. &apos;+3:30&apos;) or ends at the given time (if absolute e.g &apos;@5:00&apos;, &apos;runtime&apos;), and uses the given gas.
-An empty gas means &apos;use previous gas&apos; (or AIR if no gas was specified).
-An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.
-CC SetPoint specifies CC (rebreather) dives, leave empty for OC.&lt;/small&gt;
-</source>
-        <translation type="obsolete">&lt;small&gt;Pridaj segment nižšie.
-Každý riadok predstavuje časť plánovaného ponoru.
-Riadok s hĺbkou, časom a dýchacou zmesou popisuje segment, ktorý končí v zadanej hĺbke,  trvá zadaný čas (ak zadaný relatívne, napr. &apos;+3:30&apos;) alebo končí v zadaný čas (ak zadaný absolútne, napr. &apos;@5:00&apos;), a používa zadanú zmes.
-Nezadaná zmes znamená &apos;použi predchádzajúcu zmes&apos; (alebo vzduch, ak žiadna zmes nebola zadaná).
-Riadok, ktorý ma zadanú hĺbku a dýchaciu zmes, no nemá zadaný čas, je špeciálny; informuje plánovač, že daná zmes je plánovaná len pre výstup po dosiahnutí zadanej hĺbky.
-CC SetPoint špecifikuje CC (rebreather) ponory, čiže nevypĺňať pre OC.&lt;/small&gt;
-</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">Vzduch</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">O Subsurface</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Pridať</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Pridať Ponor...</translation>
-    </message>
-    <message>
-        <source>Add bookmark event here</source>
-        <translation type="obsolete">Pridaj poznámku</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Pridať ponor</translation>
-    </message>
-    <message>
-        <source>Add gas change event here</source>
-        <translation type="obsolete">Pridaj zmenu zmesi</translation>
-    </message>
-    <message>
-        <source>Add gaschange event at %d:%02u</source>
-        <translation type="obsolete">Pridaj zmenu zmesi o %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Pridať do akcie vyššie</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Pridaj zastávku</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Tlak vzduchu</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Teplota vzduchu</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Teplota vzduchu v %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Vždycky preferuje nahratý ponor</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">Apr</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">Aug</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Automatické zgrupovanie</translation>
-    </message>
-    <message>
-        <source>Available gases</source>
-        <translation type="obsolete">Zmesi k dispozícii</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Priemer</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Priemer</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Priemer</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Priemer</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Priemerná hĺbka</translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Priem. hĺbka (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">Priemerná spotreba</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Priemerná teplota</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Priemerný čas</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Záchrana na OC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Partner</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CC SetPoint</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Neviem nájsť zmes %d/%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">Nemôžem otvoriť stylesheet (%s)/%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Zrušené, korektne ukončenie...</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Zrušené...</translation>
-    </message>
-    <message>
-        <source>Cannot add gas change</source>
-        <translation type="obsolete">Nemôžem pridať zmenu zmesi</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Nemôžem spracovať odpoveď!</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Celsius</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Vyber default XML súbor</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Vyber XML súbor pre import do aktuálneho data súboru</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Zatvoriť</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Zredukovať všetky</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Pripájam...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Chyba spojenia</translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Vytvoriť novú akciu nad</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">kubická stopa</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Fľaša</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Fľaša</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Fľaša pre plánovanie</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Fľaše</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">H:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">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>
-        <source>Database connection failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Spojenie s databázou zlýhalo &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Požiadavka na databázu zlyhala &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query get_events failed.
-</source>
-        <translation type="obsolete">Neúspešná požiadavka: get_events.⏎
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Dátum</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Dátum a čas</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Dátum:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">Dec</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">Default XML Súbor</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Zmaž údaje o počítači</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Zmazať ponor</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Zmazať ponory</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Hĺbka</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Prekročená Maximálna Hĺbka</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Hĺbka:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Id zariadenia</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Zariadenie alebo bod pripojenia</translation>
-    </message>
-    <message>
-        <source>Display invalid dives</source>
-        <translation type="obsolete">Zobraz neplatné ponory</translation>
-    </message>
-    <message>
-        <source>Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</source>
-        <extracomment>++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-&lt;trailing text&gt;
-</extracomment>
-        <translation type="obsolete">Ponor #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Ponor #%d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Ponor #%d: %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Voliteľný názov počítača</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Informácie</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Poznámky</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Plán ponoru - TOTO JE LEN SIMULÁCIA; NEPOUŽÍVAJ NA POTÁPANIE</translation>
-    </message>
-    <message>
-        <source>Dive Tags</source>
-        <translation type="obsolete">Označenia ponorov</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Čas Ponoru</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Alarm Času Ponoru</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Info: Čas Ponoru</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Počítač - výrobca a produkt</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Chyba importu dát</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Miesto ponoru</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Divemaster</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">Začiatok ponoru?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Ponor č.</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Font pre ponory</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Divemaster</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Ponory</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Miesta ponorov</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Nahratie údajov z počítača</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Nahratie údajov z počítača...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Nahratie údajov z internetu</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Nahratie údajov z internetu...</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Nahrávanie úspešne ukončené!</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Dĺžka (min)</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Dĺžka (min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">E</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editovať</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Edituj názov zariadenia</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Zmena voliteľného mena počítača</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Editovať akciu</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Editovať sumár</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Zmeň voliteľný názov počítača dvojitým kliknutím na jeho meno</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Editovať ponor</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Editovať dátum/čas</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Editovať ponory</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Editovať viac ponorov</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Editovať sumár</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Povoliť / zakázať udalosti</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Tags</source>
-        <translation type="obsolete">Povoľ / Zakaž označenia</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Koniec</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Cieľová hĺbka</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Zadaj identifikačné údaje užívateľa a použi &apos;Download&apos;. Po ukončení nahrávania údajov môžeš použiť &apos;Apply&apos; ak si praješ aplikovať zmeny.</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Výstroj</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Chyba</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Chyba získania slanosti vody</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Chyba spracovania času</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Chyba spracovania času ponoru</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Chyba spracovania zmesi plynu</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Chyba spracovania dýchacích zmesí</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Chyba spracovania maximálnej hĺbky</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Chyba spracovania vzoriek</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Chyba registrácie správcu ukončenia</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Chyba registrácie dát</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Chyba registrácia správcu udalosti.</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Udalosť: systime=%&lt;PRId64&gt;, devtime=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Udalosť: Čakanie na vstup uživateľa</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Expandovať všetky</translation>
-    </message>
-    <message>
-        <source>Export As UDDF File</source>
-        <translation type="obsolete">Exportuj ako UDDF súbor</translation>
-    </message>
-    <message>
-        <source>Export UDDF...</source>
-        <translation type="obsolete">UDDF export ...</translation>
-    </message>
-    <message>
-        <source>Export dive(s) to UDDF</source>
-        <translation type="obsolete">Exportuj ponor(y) do UDDF</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Chyba pri otváraní %i súborov</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Chyba pri spracovaní &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Chyba pri spracovaní &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Chyba pri načítaní &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Chyba pri načítaní &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">Feb</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">stopa</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Súbor</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filter</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Vynútiť načítanie všetkých ponorov</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pi</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFhigh</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFhigh pre plán</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFlow</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFlow pre plán</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (WGS84 alebo GPS format)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Použitá zmes</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Použitá zmes</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Použitá zmes</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Spotreba plynu:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Zmes</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Všeobecné nastavenia</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Pomoc</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">Nečinnosť</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Importuj súbor(y)...</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Info</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Inicializácia komunikácie</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Plánovanie</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Neplatná hĺbka - nemožnosť spracovať &quot;%s&quot;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Neplatná hĺbka - hodnoty pod 400m nie sú podporované</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Neplatná zmes na riadku %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Neplatný čas začiatku</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Neplatný identifikátor užívateľa!</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Jan</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">Jul</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">Jun</translation>
-    </message>
-    <message>
-        <source>Last stop at 20 Feet</source>
-        <translation type="obsolete">Posledná zastávka v 20 stopách</translation>
-    </message>
-    <message>
-        <source>Last stop at 6 Meters</source>
-        <translation type="obsolete">Posledná zastávka v 6 metroch</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Možnosti rozmiestnenia</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel a ďalší, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Zoznam</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">liter</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Miesto</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Najdlhší</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Najdlhší ponor</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Alarm: Slabá batéria</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Upozornenie: Slabá batéria</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Zdroj máp</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Mark invalid</source>
-        <translation type="obsolete">Označ ako neplatný</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Označ pozíciu</translation>
-    </message>
-    <message>
-        <source>Mark valid</source>
-        <translation type="obsolete">Označ ako platný</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">Značka</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">Master</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Upozornenie: Max. dekompresný čas</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Max. hĺbka</translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Max. hĺbka (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Max. spotreba</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Max. teplota</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Max. hĺbka: %.*f %s
-Dĺžka: %d min
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Max. CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Max. tlak</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Maximum</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Maximum</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Maximum</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">Máj</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Zlučiť ponory</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Spoj akciu s akciou nad</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Spoj akciu s akciou pod</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">meter</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Min. hĺbka</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Min. spotreba</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Min. teplota</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Rôzne voľby</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Model</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Po</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Multiplatformový SW na správu ponorov v C</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nový</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Nové začiatočné číslo</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Nasledujúci DC</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Voliteľný názov</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Žiadne informácie o fľaši</translation>
-    </message>
-    <message>
-        <source>No cylinders listed for this dive.</source>
-        <translation type="obsolete">Pre tento ponor neboli zvolené žiadne fľaše.</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Poznámky</translation>
-    </message>
-    <message>
-        <source>Notes height (%d%% - %d%%)</source>
-        <translation type="obsolete">Výška poznámok (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Poznámky na vrchu</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">Nov</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">OLF</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">Okt</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Nešpecifikovaná PTHREAD chyba</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Môžem zmazať položku?</translation>
-    </message>
-    <message>
-        <source>Only display dives with these tags:</source>
-        <translation type="obsolete">Zobraz ponory s nasledujúcimi označeniami:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Otvoriť súbor</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Otvoriť...</translation>
-    </message>
-    <message>
-        <source>Ordering</source>
-        <translation type="obsolete">Radenie</translation>
-    </message>
-    <message>
-        <source>Other data height (%d%% - %d%%)</source>
-        <translation type="obsolete">Výška pre ostatné údaje (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Kyslik</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">PO2 Alarm: Výstup</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">PO2 Upozornenie: Výstup</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">PO2 Upozornenie: Zelená</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Heslo</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Vyber na mape</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Plánovač</translation>
-    </message>
-    <message>
-        <source>Please enter your userid and password for divelogs.de. The selected dives will be added to your account</source>
-        <translation type="obsolete">Zadaj užívateľské meno a heslo pre divelogs.de. Vybrané ponory budú pridané k Tvojmu účtu</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Nastavenia</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Nastavenia...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Tlak</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Tlak:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Predchádzajúci DC</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">Farebná tlač</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Tlačiť vybrané ponory</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Tlačiť výber</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Druh tlače</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Tlačiť...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Profil</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Nastavenia profilu</translation>
-    </message>
-    <message>
-        <source>Profile height (%d%% - %d%%)</source>
-        <translation type="obsolete">Výška profilu (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Profil na vrchu</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Koniec</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Alarm: zostávajúci čas plynu</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Upozornenie: zostávajúci čas plynu</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Hodnotenie</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Načítavam %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Zmaž</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Vymaž akciu</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Vymaž ponor z akcie</translation>
-    </message>
-    <message>
-        <source>Remove event here</source>
-        <translation type="obsolete">Zmaž túto udalosť</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Vymaž vybrané ponory z akcie</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Prečíslovanie</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Prečíslovanie...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Skús znovu</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">Spotreba plynu</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">SAC počas dekompresnej zastávky</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">SAC počas ponoru</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Nedodržaná bezpečnostná zastávka</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">So</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Uložiť ako...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Uložiť zmeny?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Uložiť súbor ako</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Uložiť ako</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Uložiť...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Časový segment</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Voľba udalosti</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Voľba udalosti...</translation>
-    </message>
-    <message>
-        <source>Select Tags...</source>
-        <translation type="obsolete">Zvoľ označenia...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">Sep</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Čiastočný zápis do req.txt súboru
-Je Uemis Zurich korektne pripojený?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Najkratší</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Najkratší ponor</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Zobraz stĺpce</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">Zobraz EAD, END, EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">Zobraz MOD</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Zobraz vypočítanú hladinu</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Zobraz počítačom hlásenú hladinu červenou</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Zobraz na mape</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">Zobraz pHe graf</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">Zobraz pN%s graf</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">Zobraz pO%s graf</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simulovaný Ponor</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Veľkosť</translation>
-    </message>
-    <message>
-        <source>Sizing heights (%% of layout)</source>
-        <translation type="obsolete">Rozdelenie výšky (%% celej plochy)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Alarm: Rýchlosť</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Upozornenie: Rýchlosť</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Štart</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Začať nahrávanie</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Štatistika</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Štatistika %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Štatistiky</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Stav</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Zvláštne percenta v %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Oblek</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">Ne</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Povrchový interval</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Tlak na hladine (mbar)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Zmena plynu na %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Tlač tabuľky</translation>
-    </message>
-    <message>
-        <source>Tags are only shown if they are identical for all edited dives</source>
-        <translation type="obsolete">Označenia sú zobrazené len ak sú identické pre všetky editované ponory</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Odporúčaná zmena fľaše</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Info: Tlak vo fľaši</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Tec nastavenia</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Teplota</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Teplota</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Teplota:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Kombinovaný</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Št</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Čas</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Na editovanie informácii o ponore
-klikni 2x na ponor v zozname</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zmeň veľkosť</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">Príliš veľa zmesí</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">Príliš veľa zastávok</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Celkový čas</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Celkový čas</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Celková hmotnosť:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Akcia %1$s, %2$s %3$d, %4$d (%5$d ponor)</numerusform>
-            <numerusform>Akcia %1$s, %2$s %3$d, %4$d (%5$d ponorov)</numerusform>
-            <numerusform>Akcia %1$s, %2$s %3$d, %4$d (%5$d ponorov)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ut</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Typ</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zurich: Súborovy systém takmer plný
-Odpoj/znovu pripoj počítač
-a klikni na &apos;Retry&apos;</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zurich: Súborový systém plný
-Odpoj a znovu pripoj počítač
-a skus znovu</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Uemis - inicializácia neúspešná</translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">Problém inicializácie libdivecomputer</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Nie je možné spracovať %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Nie je možné otvoriť %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Jednotky</translation>
-    </message>
-    <message>
-        <source>Upload dive(s) to divelogs.de</source>
-        <translation type="obsolete">Nahraj ponor(y) na divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de</source>
-        <translation type="obsolete">Nahraj na divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de...</source>
-        <translation type="obsolete">Nahraj na divelogs.de...</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Použi pravé tlačidlo na označenie miesta ponor pod kurzorom</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Identifikátor Uživateľa</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Užívateľská príručka</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Náhľad</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Viditeľnosť</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Objem:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">W</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Upozornenie - príliš dlhý ponor, výpočet môže trvať dlhšie</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Upozornenie - príliš hlboký ponor, môže trvať príliš dlho</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Teplota vody</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Webservis</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">St</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Závažie</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Závažie</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Závažie:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">XML súbor</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Rok</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Ročná štatistika</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">Už máš jeden počítač tohto druhu
-pomenovaný ako %s
-Subsurface vie pracovať s voliteľnými menami pre rovnaké typy počítačov, aby bolo možné ich navzájom oddeliť. Prednastavený je model s identifikáciou zobrazený nižšie.
-Ak nechceš pomenovať tento počítač, klikni na &apos;Cancel&apos; a Subsurface jednoducho zobrazí model počítača ako jeho meno (čo môže znamenať, že budeš mať problém identifikovať počítač medzi záznamami o ponoroch).</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Máš neuložené zmeny.
-Chceš ich uložiť pred zatvorením súboru?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Máš neuložené zmeny v súbore %s 
-Chceš ich uložiť pred zatvorením súboru?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">vzduch</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">čas na vzduchu</translation>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">výškovy</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">členok</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">výstup</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">backplate závažie</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">opasok</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">z lode</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">poznámka</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">jaskyňa</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">dutina</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">strop</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">strop (bezpečnostná zastávka)</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">clip-on</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">cuft</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">data</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">dekompresná zastávka</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">hlboký</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">hĺbková zastávka</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">id položky logu</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">id dát miesta ponoru</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">čas ponoru</translation>
-    </message>
-    <message>
-        <source>drift</source>
-        <translation type="obsolete">prúdový</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">suchý oblek</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">pre všetky ponory</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">pre ponor #%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">pre ponory</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">pre vybraný ponor</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">pre vybrané ponory</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">sladká voda</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">ft</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">celotelový oblek</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">zmena plynu</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">smer</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">ľad</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">integrované</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">neplatný</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">neplatné číslo udalosti</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">vesta</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">jazero</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">US libra</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">long john</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">max. ppO2</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">max. CNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">max. hĺbka</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">membrana</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">min</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">id ďalších dát ponoru</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">viac než %d dní</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">nočný</translation>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">non stop čas</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">žiaden</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">pHe hranica</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">pN%s hranica</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">pO%s hranica</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">pascal</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">fotenie</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">bazén</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">rbt</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">rieka</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">bezpečnostná zastávka</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">bezpečnostná zastávka (povinná)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">bezpečnostná zastávka (dobrovoľná)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">polosuchý</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">z brehu</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">krátky</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">povrch</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">výuka</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">upozornenie nasýtenia tkanív</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">tréning</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">Jozef (Ďoďo) Ivanecký</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">vysielač</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">nez.</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">neznámy</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">nešpecifikovaný</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">vesta</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">kamera</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">prekročenie</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">hmotnosť</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">neoprén</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">záťaž</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">vrak</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk_SK" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Čas</translation>
+        <translation>Čas</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Hĺbka</translation>
+        <translation>Hĺbka</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Teplota</translation>
+        <translation>Teplota</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2388,57 +77,57 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Veľkosť</translation>
+        <translation>Veľkosť</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2446,41 +135,41 @@ tranlators here
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Zmena voliteľného mena počítača</translation>
+        <translation>Zmena voliteľného mena počítača</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Model</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Model</translation>
+        <source>Device ID</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Voliteľný názov</translation>
+        <translation>Voliteľný názov</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2488,12 +177,12 @@ tranlators here
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2501,95 +190,87 @@ tranlators here
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Spoj akciu s akciou nad</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Spoj akciu s akciou pod</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2597,48 +278,48 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2646,23 +327,23 @@ tranlators here
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2670,37 +351,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">Vzduch</translation>
+        <translation>Vzduch</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Dĺžka (min)</translation>
+        <translation>Dĺžka (min)</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2708,17 +389,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2726,67 +407,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Dátum</translation>
+        <translation>Dátum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">min</translation>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">US libra</translation>
+        <translation>US libra</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Oblek</translation>
+        <translation>Oblek</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Fľaša</translation>
+        <translation>Fľaša</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">Spotreba plynu</translation>
+        <translation>Spotreba plynu</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">max. CNS</translation>
+        <translation>max. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Miesto</translation>
+        <translation>Miesto</translation>
     </message>
 </context>
 <context>
@@ -2795,17 +476,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Chyba</translation>
+        <translation>Chyba</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Skús znovu</translation>
+        <translation>Skús znovu</translation>
     </message>
 </context>
 <context>
@@ -2813,47 +494,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Nahratie údajov z počítača</translation>
+        <translation>Nahratie údajov z počítača</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Vynútiť načítanie všetkých ponorov</translation>
+        <translation>Vynútiť načítanie všetkých ponorov</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2861,225 +542,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Poznámky</translation>
+        <translation>Poznámky</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Miesto</translation>
+        <translation>Miesto</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Divemaster</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Partner</translation>
+        <translation>Partner</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Hodnotenie</translation>
+        <translation>Hodnotenie</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Viditeľnosť</translation>
+        <translation>Viditeľnosť</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Oblek</translation>
+        <translation>Oblek</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Poznámky</translation>
+        <translation>Poznámky</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Výstroj</translation>
+        <translation>Výstroj</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Informácie</translation>
+        <translation>Informácie</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Dátum</translation>
+        <translation>Dátum</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">Spotreba plynu</translation>
+        <translation>Spotreba plynu</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Čas Ponoru</translation>
+        <translation>Čas Ponoru</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Štatistiky</translation>
+        <translation>Štatistiky</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Hĺbka</translation>
+        <translation>Hĺbka</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Teplota</translation>
+        <translation>Teplota</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Dĺžka (min)</translation>
+        <translation>Dĺžka (min)</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Celkový čas</translation>
+        <translation>Celkový čas</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Ponory</translation>
+        <translation>Ponory</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Fľaše</translation>
+        <translation>Fľaše</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -3088,32 +769,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">neznámy</translation>
+        <translation>neznámy</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">E</translation>
+        <translation>E</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">W</translation>
+        <translation>W</translation>
     </message>
 </context>
 <context>
@@ -3121,417 +802,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Súbor</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Náhľad</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Pomoc</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Nový</translation>
+        <translation>Nový</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Uložiť ako</translation>
+        <translation>Uložiť ako</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Zatvoriť</translation>
+        <translation>Zatvoriť</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Profil</translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Info</translation>
+        <translation>Info</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Nastavenia</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Koniec</translation>
+        <translation>Nastavenia</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Edituj názov zariadenia</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Prečíslovanie</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zmeň veľkosť</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Ročná štatistika</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Predchádzajúci DC</translation>
+        <translation>Predchádzajúci DC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Nasledujúci DC</translation>
+        <translation>Nasledujúci DC</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Voľba udalosti</translation>
+        <translation>Voľba udalosti</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Plánovanie</translation>
+        <translation>Plánovanie</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">O Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Užívateľská príručka</translation>
+        <translation>O Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Otvoriť súbor</translation>
+        <translation>Otvoriť súbor</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Uložiť zmeny?</translation>
+        <translation>Uložiť zmeny?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3541,17 +1182,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3559,289 +1200,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Jednotky</translation>
+        <translation>Jednotky</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Ponory</translation>
+        <translation>Ponory</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Hĺbka</translation>
+        <translation>Hĺbka</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">meter</translation>
+        <translation>meter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">stopa</translation>
+        <translation>stopa</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Tlak</translation>
+        <translation>Tlak</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">liter</translation>
+        <translation>liter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">kubická stopa</translation>
+        <translation>kubická stopa</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Teplota</translation>
+        <translation>Teplota</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Celsius</translation>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Fahrenheit</translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Závažie</translation>
+        <translation>Závažie</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">US libra</translation>
+        <translation>US libra</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3849,7 +1490,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3857,37 +1498,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Ponor č.</translation>
+        <translation>Ponor č.</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Dátum</translation>
+        <translation>Dátum</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Hĺbka</translation>
+        <translation>Hĺbka</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Dĺžka (min)</translation>
+        <translation>Dĺžka (min)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">Master</translation>
+        <translation>Master</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Partner</translation>
+        <translation>Partner</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Miesto</translation>
+        <translation>Miesto</translation>
     </message>
 </context>
 <context>
@@ -3895,84 +1536,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Tlačiť vybrané ponory</translation>
+        <translation>Tlačiť vybrané ponory</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">Farebná tlač</translation>
+        <translation>Farebná tlač</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Druh tlače</translation>
+        <translation>Druh tlače</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 ponorov na stránku</translation>
+        <translation>6 ponorov na stránku</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 ponory na stránku</translation>
+        <translation>2 ponory na stránku</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Tlač tabuľky</translation>
+        <translation>Tlač tabuľky</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished">Radenie</translation>
+        <translation>Radenie</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Profil na vrchu</translation>
+        <translation>Profil na vrchu</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Poznámky na vrchu</translation>
+        <translation>Poznámky na vrchu</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3980,87 +1621,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Editovať</translation>
+        <translation>Editovať</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">vzduch</translation>
+        <translation>vzduch</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Záchrana na OC</translation>
+        <translation>Záchrana na OC</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">začiatok</translation>
+        <translation>začiatok</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">koniec</translation>
+        <translation>koniec</translation>
     </message>
 </context>
 <context>
@@ -4068,62 +1709,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">neznámy</translation>
+        <translation>neznámy</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Fľaša</translation>
+        <translation>Fľaša</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Zmes</translation>
+        <translation>Zmes</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished">Použitá zmes</translation>
+        <translation>Použitá zmes</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">Spotreba plynu</translation>
+        <translation>Spotreba plynu</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Max. CNS</translation>
+        <translation>Max. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4131,50 +1772,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">Vzduch</translation>
+        <translation>Vzduch</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Zatvoriť</translation>
+        <translation>Zatvoriť</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Priemer</translation>
+        <translation>Priemer</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished">Minimum</translation>
+        <translation>Minimum</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished">Maximum</translation>
+        <translation>Maximum</translation>
     </message>
 </context>
 <context>
@@ -4182,12 +1815,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Prečíslovanie</translation>
+        <translation>Prečíslovanie</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Nové začiatočné číslo</translation>
+        <translation>Nové začiatočné číslo</translation>
     </message>
 </context>
 <context>
@@ -4195,27 +1828,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4223,27 +1856,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">O Subsurface</translation>
+        <translation>O Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4251,37 +1884,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Webservis</translation>
+        <translation>Webservis</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Chyba spojenia</translation>
+        <translation>Chyba spojenia</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Neplatný identifikátor užívateľa!</translation>
+        <translation>Neplatný identifikátor užívateľa!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Nemôžem spracovať odpoveď!</translation>
+        <translation>Nemôžem spracovať odpoveď!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Nahrávanie úspešne ukončené!</translation>
+        <translation>Nahrávanie úspešne ukončené!</translation>
     </message>
 </context>
 <context>
@@ -4289,30 +1922,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
@@ -4320,20 +1953,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -4341,37 +1974,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Heslo</translation>
+        <translation>Heslo</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4379,17 +2012,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Závažie</translation>
+        <translation>Závažie</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4398,42 +2031,42 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4441,7 +2074,7 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4449,19 +2082,19 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4469,64 +2102,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">pascal</translation>
+        <translation>pascal</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">cuft</translation>
+        <translation>cuft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">US libra</translation>
+        <translation>US libra</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) alebo (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) alebo (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4536,32 +2165,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">vzduch</translation>
+        <translation>vzduch</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">integrované</translation>
+        <translation>integrované</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">opasok</translation>
+        <translation>opasok</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">členok</translation>
+        <translation>členok</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">backplate závažie</translation>
+        <translation>backplate závažie</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">clip-on</translation>
+        <translation>clip-on</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4571,314 +2200,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Chyba pri načítaní &apos;%s&apos;</translation>
+        <translation>Chyba pri načítaní &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">žiaden</translation>
+        <translation>žiaden</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">dekompresná zastávka</translation>
+        <translation>dekompresná zastávka</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">rbt</translation>
+        <translation>rbt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">výstup</translation>
+        <translation>výstup</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">strop</translation>
+        <translation>strop</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">záťaž</translation>
+        <translation>záťaž</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">vysielač</translation>
+        <translation>vysielač</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">prekročenie</translation>
+        <translation>prekročenie</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">poznámka</translation>
+        <translation>poznámka</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">povrch</translation>
+        <translation>povrch</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">bezpečnostná zastávka</translation>
+        <translation>bezpečnostná zastávka</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">zmena plynu</translation>
+        <translation>zmena plynu</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">bezpečnostná zastávka (dobrovoľná)</translation>
+        <translation>bezpečnostná zastávka (dobrovoľná)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">bezpečnostná zastávka (povinná)</translation>
+        <translation>bezpečnostná zastávka (povinná)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">hĺbková zastávka</translation>
+        <translation>hĺbková zastávka</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">strop (bezpečnostná zastávka)</translation>
+        <translation>strop (bezpečnostná zastávka)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">čas ponoru</translation>
+        <translation>čas ponoru</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">max. hĺbka</translation>
+        <translation>max. hĺbka</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">OLF</translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">čas na vzduchu</translation>
+        <translation>čas na vzduchu</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">smer</translation>
+        <translation>smer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">upozornenie nasýtenia tkanív</translation>
+        <translation>upozornenie nasýtenia tkanív</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">non stop čas</translation>
+        <translation>non stop čas</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">neplatné číslo udalosti</translation>
+        <translation>neplatné číslo udalosti</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Nie je možné spracovať %s %s</translation>
+        <translation>Nie je možné spracovať %s %s</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Chyba registrácie dát</translation>
+        <translation>Chyba registrácie dát</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Chyba spracovania času</translation>
+        <translation>Chyba spracovania času</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Ponor #%d: %s %d %04d</translation>
+        <translation>Ponor #%d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Chyba spracovania času ponoru</translation>
+        <translation>Chyba spracovania času ponoru</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Chyba spracovania maximálnej hĺbky</translation>
+        <translation>Chyba spracovania maximálnej hĺbky</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Chyba spracovania dýchacích zmesí</translation>
+        <translation>Chyba spracovania dýchacích zmesí</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Chyba získania slanosti vody</translation>
+        <translation>Chyba získania slanosti vody</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Chyba spracovania zmesi plynu</translation>
+        <translation>Chyba spracovania zmesi plynu</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Chyba spracovania vzoriek</translation>
+        <translation>Chyba spracovania vzoriek</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Udalosť: Čakanie na vstup uživateľa</translation>
+        <translation>Udalosť: Čakanie na vstup uživateľa</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
+        <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Chyba registrácia správcu udalosti.</translation>
+        <translation>Chyba registrácia správcu udalosti.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Chyba registrácie správcu ukončenia</translation>
+        <translation>Chyba registrácie správcu ukončenia</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Chyba importu dát</translation>
+        <translation>Chyba importu dát</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">Problém inicializácie libdivecomputer</translation>
+        <translation>Problém inicializácie libdivecomputer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Nie je možné otvoriť %s %s (%s)</translation>
+        <translation>Nie je možné otvoriť %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Zvláštne percenta v %s
+        <translation>Zvláštne percenta v %s
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Chyba pri spracovaní &apos;%s&apos;.
+        <translation>Chyba pri spracovaní &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Chyba pri spracovaní &apos;%s&apos;</translation>
+        <translation>Chyba pri spracovaní &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished">Neúspešná požiadavka: get_events.⏎
+        <translation>Neúspešná požiadavka: get_events.⏎
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished">Spojenie s databázou zlýhalo &apos;%s&apos;.
+        <translation>Spojenie s databázou zlýhalo &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished">Požiadavka na databázu zlyhala &apos;%s&apos;.
+        <translation>Požiadavka na databázu zlyhala &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">Nemôžem otvoriť stylesheet (%s)/%s</translation>
+        <translation>Nemôžem otvoriť stylesheet (%s)/%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Neviem nájsť zmes %d/%d</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Fľaša pre plánovanie</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simulovaný Ponor</translation>
+        <translation>Neviem nájsť zmes %d/%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">Príliš veľa zmesí</translation>
+        <translation>Príliš veľa zmesí</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4887,7 +2508,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Subsurface plan ponoru
 zrátaný s  GFlow = %.0f a GFhigh = %.0f
 
@@ -4897,166 +2518,162 @@ zrátaný s  GFlow = %.0f a GFhigh = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s
+        <translation>Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s
+        <translation>Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Zmena plynu na %s
+        <translation>Zmena plynu na %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Spotreba plynu:
+        <translation>Spotreba plynu:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s z %s
+        <translation>%.0f%s z %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">H:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 P:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Vypočítaná hladina %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Bezpečnostná zastávka:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Bezpečnostná zastávka:nezn. čas @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deco:nezn. čas @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 In deco</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
@@ -5065,7 +2682,7 @@ MOD:%d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 EAD:%d%s
 END:%d%s
 EADD:%d%s</translation>
@@ -5074,352 +2691,336 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">neplatný</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">z lode</translation>
+        <translation>z lode</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">z brehu</translation>
+        <translation>z brehu</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished">prúdový</translation>
+        <translation>prúdový</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">hlboký</translation>
+        <translation>hlboký</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">dutina</translation>
+        <translation>dutina</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">ľad</translation>
+        <translation>ľad</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">vrak</translation>
+        <translation>vrak</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">jaskyňa</translation>
+        <translation>jaskyňa</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">výškovy</translation>
+        <translation>výškovy</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">bazén</translation>
+        <translation>bazén</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">jazero</translation>
+        <translation>jazero</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">rieka</translation>
+        <translation>rieka</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">nočný</translation>
+        <translation>nočný</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">sladká voda</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">tréning</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">výuka</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">fotenie</translation>
+        <translation>fotenie</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">kamera</translation>
+        <translation>kamera</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished"></translation>
+        <translation>deco</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">viac než %d dní</translation>
+        <translation>viac než %d dní</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dd %dh %dmin</translation>
+        <translation>%dd %dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dh %dmin</translation>
+        <translation>%dh %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">pre ponory</translation>
+        <translation>pre ponory</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">pre vybrané ponory</translation>
+        <translation>pre vybrané ponory</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">pre ponor #%d</translation>
+        <translation>pre ponor #%d</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">pre vybraný ponor</translation>
+        <translation>pre vybraný ponor</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">pre všetky ponory</translation>
+        <translation>pre všetky ponory</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(žiadné ponory)</translation>
+        <translation>(žiadné ponory)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">Ne</translation>
+        <translation>Ne</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">Po</translation>
+        <translation>Po</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">Ut</translation>
+        <translation>Ut</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">St</translation>
+        <translation>St</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">Št</translation>
+        <translation>Št</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">Pi</translation>
+        <translation>Pi</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">So</translation>
+        <translation>So</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">Jan</translation>
+        <translation>Jan</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">Feb</translation>
+        <translation>Feb</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">Mar</translation>
+        <translation>Mar</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">Apr</translation>
+        <translation>Apr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">Máj</translation>
+        <translation>Máj</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">Jun</translation>
+        <translation>Jun</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">Jul</translation>
+        <translation>Jul</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">Aug</translation>
+        <translation>Aug</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">Sep</translation>
+        <translation>Sep</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">Okt</translation>
+        <translation>Okt</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">Nov</translation>
+        <translation>Nov</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">Dec</translation>
+        <translation>Dec</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zurich: Súborovy systém takmer plný
+        <translation>Uemis Zurich: Súborovy systém takmer plný
 Odpoj/znovu pripoj počítač
 a klikni na &apos;Retry&apos;</translation>
     </message>
@@ -5428,7 +3029,7 @@ a klikni na &apos;Retry&apos;</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zurich: Súborový systém plný
+        <translation>Uemis Zurich: Súborový systém plný
 Odpoj a znovu pripoj počítač
 a skus znovu</translation>
     </message>
@@ -5436,193 +3037,193 @@ a skus znovu</translation>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Čiastočný zápis do req.txt súboru
+        <translation>Čiastočný zápis do req.txt súboru
 Je Uemis Zurich korektne pripojený?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">neznámy</translation>
+        <translation>neznámy</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Načítavam %s %s</translation>
+        <translation>Načítavam %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">data</translation>
+        <translation>data</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">id položky logu</translation>
+        <translation>id položky logu</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">id dát miesta ponoru</translation>
+        <translation>id dát miesta ponoru</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">id ďalších dát ponoru</translation>
+        <translation>id ďalších dát ponoru</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">neoprén</translation>
+        <translation>neoprén</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">polosuchý</translation>
+        <translation>polosuchý</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">suchý oblek</translation>
+        <translation>suchý oblek</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">krátky</translation>
+        <translation>krátky</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">vesta</translation>
+        <translation>vesta</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">long john</translation>
+        <translation>long john</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">vesta</translation>
+        <translation>vesta</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">celotelový oblek</translation>
+        <translation>celotelový oblek</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">2 dielny oblek</translation>
+        <translation>2 dielny oblek</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">membrana</translation>
+        <translation>membrana</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Inicializácia komunikácie</translation>
+        <translation>Inicializácia komunikácie</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Uemis - inicializácia neúspešná</translation>
+        <translation>Uemis - inicializácia neúspešná</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Začať nahrávanie</translation>
+        <translation>Začať nahrávanie</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Nedodržaná bezpečnostná zastávka</translation>
+        <translation>Nedodržaná bezpečnostná zastávka</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Alarm: Rýchlosť</translation>
+        <translation>Alarm: Rýchlosť</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Upozornenie: Rýchlosť</translation>
+        <translation>Upozornenie: Rýchlosť</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">PO2 Upozornenie: Zelená</translation>
+        <translation>PO2 Upozornenie: Zelená</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">PO2 Upozornenie: Výstup</translation>
+        <translation>PO2 Upozornenie: Výstup</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">PO2 Alarm: Výstup</translation>
+        <translation>PO2 Alarm: Výstup</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Info: Tlak vo fľaši</translation>
+        <translation>Info: Tlak vo fľaši</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Upozornenie: zostávajúci čas plynu</translation>
+        <translation>Upozornenie: zostávajúci čas plynu</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Alarm: zostávajúci čas plynu</translation>
+        <translation>Alarm: zostávajúci čas plynu</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Odporúčaná zmena fľaše</translation>
+        <translation>Odporúčaná zmena fľaše</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Prekročená Maximálna Hĺbka</translation>
+        <translation>Prekročená Maximálna Hĺbka</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Upozornenie: Max. dekompresný čas</translation>
+        <translation>Upozornenie: Max. dekompresný čas</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Info: Čas Ponoru</translation>
+        <translation>Info: Čas Ponoru</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Alarm Času Ponoru</translation>
+        <translation>Alarm Času Ponoru</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">Značka</translation>
+        <translation>Značka</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Žiadne informácie o fľaši</translation>
+        <translation>Žiadne informácie o fľaši</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Upozornenie: Slabá batéria</translation>
+        <translation>Upozornenie: Slabá batéria</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Alarm: Slabá batéria</translation>
+        <translation>Alarm: Slabá batéria</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index 8c5ba613d..07a33d7f0 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -1,2383 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="se_FI">
-<context>
-    <name></name>
-    <message>
-        <source>
-No Events
-</source>
-        <translation type="obsolete">
-Inga händelser
-</translation>
-    </message>
-    <message>
-        <source> &gt; Month</source>
-        <comment>Stats</comment>
-        <translation type="obsolete"> &gt; Månad</translation>
-    </message>
-    <message>
-        <source> Download</source>
-        <translation type="obsolete">Ladda ned</translation>
-    </message>
-    <message>
-        <source> Please select dive computer and device. </source>
-        <translation type="obsolete"> Välj dykdator och enhet</translation>
-    </message>
-    <message>
-        <source> begin</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">start</translation>
-    </message>
-    <message>
-        <source> end</source>
-        <comment>Starts with space!</comment>
-        <translation type="obsolete">slut</translation>
-    </message>
-    <message>
-        <source>#</source>
-        <translation type="obsolete">#</translation>
-    </message>
-    <message>
-        <source>%.*f %s</source>
-        <translation type="obsolete">%.*f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s
-</source>
-        <translation type="obsolete">%.*f %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.*f %s/min</source>
-        <translation type="obsolete">%.*f %s/min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%.0f%s of %s
-</source>
-        <translation type="obsolete">%.0f%s av %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d</source>
-        <extracomment>++GETTEXT 80 chars: lead text (&quot;&quot; or localized &quot;Dive #%d - &quot;) weekday,
-monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s%2$s, %4$d %3$s, %5$d   %6$d:%7$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d   %5$dh%6$02d</source>
-        <extracomment>++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %3$d %2$s, %4$d   %5$dh%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-</extracomment>
-        <translation type="obsolete">%1$s, %3$d %2$s, %4$d %5$02d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$2d:%6$02d</source>
-        <extracomment>++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-</extracomment>
-        <translation type="obsolete">%1$s, %3$d %2$s, %4$d %5$2d:%6$02d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%d min</source>
-        <translation type="obsolete">%d min</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dd %dh %dmin</source>
-        <translation type="obsolete">%dd %dt %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%dh %dmin</source>
-        <translation type="obsolete">%dt %dmin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s</source>
-        <translation type="obsolete">%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-CNS:%u%%</source>
-        <translation type="obsolete">%s
-CNS:%u%%</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Calculated ceiling %.0f %s</source>
-        <translation type="obsolete">%s
-Beräknat tak %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deko:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Deco:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Deko:okänd tid @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
-        <translation type="obsolete">%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-In deco</source>
-        <translation type="obsolete">%s
-i deko</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-MOD:%d%s</source>
-        <translation type="obsolete">%s
-MOD:%d%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-NDL:%umin</source>
-        <translation type="obsolete">%s
-NDL:%umin</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-P:%d %s</source>
-        <translation type="obsolete">%s
-P:%d %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:%umin @ %.0f %s</source>
-        <translation type="obsolete">%s
-Såkerhetsstopp:%umin @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
-        <translation type="obsolete">%s
-Säkerhetsstopp:okänd tid @ %.0f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="obsolete">%s
-Subsurface dykplan
-baserad på GFlow = %.0f och GFhigh = %.0f
-
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-T:%.1f %s</source>
-        <translation type="obsolete">%s
-T:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pHe:%.2fbar</source>
-        <translation type="obsolete">%s
-pHe:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pN%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pN%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s
-pO%s:%.2fbar</source>
-        <translation type="obsolete">%s
-pO%s:%.2fbar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s event at %d:%02u</source>
-        <translation type="obsolete">%s händelse vid %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>%s: Response from divelogs.de</source>
-        <translation type="obsolete">%s: Svar från divelogs.de</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(%s) or (%s)</source>
-        <translation type="obsolete">(%s) eller (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(click to edit date/time)</source>
-        <translation type="obsolete">(klicka för att ändra datum/tid)</translation>
-    </message>
-    <message>
-        <source>(click to edit date/time/depth)</source>
-        <translation type="obsolete">(klicka för att ändra datum/tid/djup)</translation>
-    </message>
-    <message>
-        <source>(no dives)</source>
-        <translation type="obsolete">(inga dyk)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>(nothing)</source>
-        <translation type="obsolete">(inget)</translation>
-    </message>
-    <message>
-        <source>0.6 cuft/min</source>
-        <translation type="obsolete">0.6 ft³/min</translation>
-    </message>
-    <message>
-        <source>0.7 cuft/min</source>
-        <translation type="obsolete">0.7 ft³/min</translation>
-    </message>
-    <message>
-        <source>17 l/min</source>
-        <translation type="obsolete">17 l/min</translation>
-    </message>
-    <message>
-        <source>2 dives per page</source>
-        <translation type="obsolete">2 dyk per sida</translation>
-    </message>
-    <message>
-        <source>2 pcs full suit</source>
-        <translation type="obsolete">2 pcs full suit</translation>
-    </message>
-    <message>
-        <source>20 l/min</source>
-        <translation type="obsolete">20 l/min</translation>
-    </message>
-    <message>
-        <source>3m increments for calculated ceiling</source>
-        <translation type="obsolete">beräknat tak i 3m steg</translation>
-    </message>
-    <message>
-        <source>6 dives per page</source>
-        <translation type="obsolete">6 dyk per sida</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;Add segments below.
-Each line describes part of the planned dive.
-An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. &apos;+3:30&apos;) or ends at the given time (if absolute e.g &apos;@5:00&apos;, &apos;runtime&apos;), and uses the given gas.
-An empty gas means &apos;use previous gas&apos; (or AIR if no gas was specified).
-An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.
-CC SetPoint specifies CC (rebreather) dives, leave empty for OC.&lt;/small&gt;
-</source>
-        <translation type="obsolete">&lt;small&gt;Lägg till dyksegment nedan. Var rad beskriver en del av den planerade dykningen. En rad med djup, tid och gas-information beskriver ett segment som slutar på det givna djupet, efter den givna tiden (om relativ tid, t.ex. &apos;+3:30&apos;) eller vid den givna tiden (om absolut), och använder den givna gasen. En tom gas betyder &apos;samma gas som tidigare segment&apos;&apos; (eller luft om det inte fanns en tidigare gas). En rad som har ett djup och gas men ingen tid är speciell; det informerar planeraren att den gasen kan användas för planering när planen överskrider det givna djpet. CC SetPoint används for CC (rebreather) dykningar, lämna tomt för OC.&lt;/small&gt;
-</translation>
-    </message>
-    <message>
-        <source>AIR</source>
-        <translation type="obsolete">LUFT</translation>
-    </message>
-    <message>
-        <source>About Subsurface</source>
-        <translation type="obsolete">Om Subsurface</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Lägg till</translation>
-    </message>
-    <message>
-        <source>Add Dive...</source>
-        <translation type="obsolete">Nytt dyk...</translation>
-    </message>
-    <message>
-        <source>Add bookmark event here</source>
-        <translation type="obsolete">Lägg till ett bokmärke här</translation>
-    </message>
-    <message>
-        <source>Add dive</source>
-        <translation type="obsolete">Nytt dyk</translation>
-    </message>
-    <message>
-        <source>Add gas change event here</source>
-        <translation type="obsolete">Lägg till gasbyte här</translation>
-    </message>
-    <message>
-        <source>Add gaschange event at %d:%02u</source>
-        <translation type="obsolete">Lägg till gasbyte här vid %d:%02u</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Add to trip above</source>
-        <translation type="obsolete">Kombinera med resan ovan</translation>
-    </message>
-    <message>
-        <source>Add waypoint</source>
-        <translation type="obsolete">Lägg till</translation>
-    </message>
-    <message>
-        <source>Air Press</source>
-        <translation type="obsolete">Lufttryck</translation>
-    </message>
-    <message>
-        <source>Air Temp</source>
-        <translation type="obsolete">Lufttemp</translation>
-    </message>
-    <message>
-        <source>Air Temp in %s</source>
-        <translation type="obsolete">Lufttemp i %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Always prefer downloaded dive</source>
-        <translation type="obsolete">Föredra alltid nyladdad dykinformation</translation>
-    </message>
-    <message>
-        <source>Apr</source>
-        <translation type="obsolete">apr</translation>
-    </message>
-    <message>
-        <source>Aug</source>
-        <translation type="obsolete">aug</translation>
-    </message>
-    <message>
-        <source>Autogroup</source>
-        <translation type="obsolete">Gruppera automatiskt</translation>
-    </message>
-    <message>
-        <source>Available gases</source>
-        <translation type="obsolete">Tillgänglig gas</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Genomsnitt</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Genomsnitt</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Genomsnitt</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Genomsnitt</translation>
-    </message>
-    <message>
-        <source>Avg Depth</source>
-        <translation type="obsolete">Medeldjup</translation>
-    </message>
-    <message>
-        <source>Avg Depth (%s):</source>
-        <translation type="obsolete">Medeldjup (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Avg SAC</source>
-        <translation type="obsolete">Medel-SAC</translation>
-    </message>
-    <message>
-        <source>Avg Temp</source>
-        <translation type="obsolete">Medel-temp</translation>
-    </message>
-    <message>
-        <source>Avg Time</source>
-        <translation type="obsolete">Medel-tid</translation>
-    </message>
-    <message>
-        <source>Bailing out to OC</source>
-        <translation type="obsolete">Bailout till öppet system</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>Buddy</source>
-        <translation type="obsolete">Parkamrat</translation>
-    </message>
-    <message>
-        <source>CC SetPoint</source>
-        <translation type="obsolete">CC SetPoint</translation>
-    </message>
-    <message>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="obsolete">Kan inte hitta gasen %d/%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="obsolete">Kunde inte öppna stilmall (%s)%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Cancelled, exiting cleanly...</source>
-        <translation type="obsolete">Avbrutet ...</translation>
-    </message>
-    <message>
-        <source>Cancelled...</source>
-        <translation type="obsolete">Avbrutet ...</translation>
-    </message>
-    <message>
-        <source>Cannot add gas change</source>
-        <translation type="obsolete">Kan inte lägga till gasbyte</translation>
-    </message>
-    <message>
-        <source>Cannot parse response!</source>
-        <translation type="obsolete">Kan inte tolka respons</translation>
-    </message>
-    <message>
-        <source>Celsius</source>
-        <translation type="obsolete">Celsius</translation>
-    </message>
-    <message>
-        <source>Choose Default XML File</source>
-        <translation type="obsolete">Välj standard XML-fil</translation>
-    </message>
-    <message>
-        <source>Choose XML Files To Import Into Current Data File</source>
-        <translation type="obsolete">Välj vilka XML-filer du vill importera</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Stäng</translation>
-    </message>
-    <message>
-        <source>Collapse all</source>
-        <translation type="obsolete">Sammanslå alla</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Kontaktar...</translation>
-    </message>
-    <message>
-        <source>Connection Error: </source>
-        <translation type="obsolete">Kontaktfel:</translation>
-    </message>
-    <message>
-        <source>Create new trip above</source>
-        <translation type="obsolete">Ny resa innan</translation>
-    </message>
-    <message>
-        <source>CuFt</source>
-        <translation type="obsolete">ft^3</translation>
-    </message>
-    <message>
-        <source>Cyl</source>
-        <translation type="obsolete">Cyl</translation>
-    </message>
-    <message>
-        <source>Cylinder</source>
-        <translation type="obsolete">Flaska</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Flaska för planering</translation>
-    </message>
-    <message>
-        <source>Cylinders</source>
-        <translation type="obsolete">Flaskor</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="obsolete">VARNING: DETTA ÄR EN NY IMPLEMENTATION AV BÜHLMANN&apos;S DEKO ALGORITM OCH EN DYKPLANERARE BASERAD PÅ DEN, OCH KODEN HAR SETT ENDAST LITE TESTNING. VI FÖRESLÅR ATT MAN INTE GÖR DYK BASERADE ENBART PÅ RESULTATEN AV DENNA PLAN!</translation>
-    </message>
-    <message>
-        <source>Database connection failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Databasanslutning misslyckades &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query failed &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Databasfråga misslyckades &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Database query get_events failed.
-</source>
-        <translation type="obsolete">Databasfråga get_events misslyckades.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>Date and Time</source>
-        <translation type="obsolete">Datum och tid</translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="obsolete">Datum:</translation>
-    </message>
-    <message>
-        <source>Dec</source>
-        <translation type="obsolete">dec</translation>
-    </message>
-    <message>
-        <source>Default XML Data File</source>
-        <translation type="obsolete">Standard XML-fil</translation>
-    </message>
-    <message>
-        <source>Delete a dive computer information entry</source>
-        <translation type="obsolete">Radera dykdatorinformation</translation>
-    </message>
-    <message>
-        <source>Delete dive</source>
-        <translation type="obsolete">Radera dyk</translation>
-    </message>
-    <message>
-        <source>Delete dives</source>
-        <translation type="obsolete">Radera dyk</translation>
-    </message>
-    <message>
-        <source>Depth</source>
-        <translation type="obsolete">Djup</translation>
-    </message>
-    <message>
-        <source>Depth Limit Exceeded</source>
-        <translation type="obsolete">Maxdjup har överskridits</translation>
-    </message>
-    <message>
-        <source>Depth:</source>
-        <translation type="obsolete">Djup:</translation>
-    </message>
-    <message>
-        <source>Device Id</source>
-        <translation type="obsolete">Enhetsnamn</translation>
-    </message>
-    <message>
-        <source>Device or mount point</source>
-        <translation type="obsolete">Enhet eller monteringspunkt</translation>
-    </message>
-    <message>
-        <source>Display invalid dives</source>
-        <translation type="obsolete">Visa ogiltiga dyk</translation>
-    </message>
-    <message>
-        <source>Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</source>
-        <extracomment>++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-&lt;trailing text&gt;
-</extracomment>
-        <translation type="obsolete">Dyk #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive #%d - </source>
-        <translation type="obsolete">Dyk #%d - </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive %d: %s %d %04d</source>
-        <translation type="obsolete">Dyk #%d: %s %d %04d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Dive Computer Nickname</source>
-        <translation type="obsolete">Dykdatornamn</translation>
-    </message>
-    <message>
-        <source>Dive Info</source>
-        <translation type="obsolete">Information</translation>
-    </message>
-    <message>
-        <source>Dive Notes</source>
-        <translation type="obsolete">Dykanteckningar</translation>
-    </message>
-    <message>
-        <source>Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING</source>
-        <translation type="obsolete">Dykplan - DETTA ÄR BARA EN SIMULATION; ANVÄND INTE FÖR DYKNING</translation>
-    </message>
-    <message>
-        <source>Dive Tags</source>
-        <translation type="obsolete">Dyktagg</translation>
-    </message>
-    <message>
-        <source>Dive Time</source>
-        <translation type="obsolete">Dyktid</translation>
-    </message>
-    <message>
-        <source>Dive Time Alert</source>
-        <translation type="obsolete">Dyktidsvarning</translation>
-    </message>
-    <message>
-        <source>Dive Time Info</source>
-        <translation type="obsolete">Dyktidsnot</translation>
-    </message>
-    <message>
-        <source>Dive computer vendor and product</source>
-        <translation type="obsolete">Dykdatorleverantör och produkt</translation>
-    </message>
-    <message>
-        <source>Dive data import error</source>
-        <translation type="obsolete">Lyckades inte importera dykdata</translation>
-    </message>
-    <message>
-        <source>Dive locations</source>
-        <translation type="obsolete">Dykplatser</translation>
-    </message>
-    <message>
-        <source>Dive master</source>
-        <translation type="obsolete">Divemaster</translation>
-    </message>
-    <message>
-        <source>Dive starts when?</source>
-        <translation type="obsolete">När börjar dyket?</translation>
-    </message>
-    <message>
-        <source>Dive#</source>
-        <translation type="obsolete">Dyknr</translation>
-    </message>
-    <message>
-        <source>Divelist Font</source>
-        <translation type="obsolete">Font för dyklistan</translation>
-    </message>
-    <message>
-        <source>Divemaster</source>
-        <translation type="obsolete">Divemaster</translation>
-    </message>
-    <message>
-        <source>Dives</source>
-        <translation type="obsolete">Dyk</translation>
-    </message>
-    <message>
-        <source>Dives Locations</source>
-        <translation type="obsolete">Dykplatser</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer</source>
-        <translation type="obsolete">Ladda ner från dykdator</translation>
-    </message>
-    <message>
-        <source>Download From Dive Computer...</source>
-        <translation type="obsolete">Ladda ner från dykdator...</translation>
-    </message>
-    <message>
-        <source>Download From Web Service</source>
-        <translation type="obsolete">Ladda ner från webbtjänst</translation>
-    </message>
-    <message>
-        <source>Download From Web Service...</source>
-        <translation type="obsolete">Ladda ned från webbtjänst...</translation>
-    </message>
-    <message>
-        <source>Download Success!</source>
-        <translation type="obsolete">Nedladdning lyckades!</translation>
-    </message>
-    <message>
-        <source>Duration</source>
-        <translation type="obsolete">Varaktighet</translation>
-    </message>
-    <message>
-        <source>Duration (min)</source>
-        <translation type="obsolete">Varaktighet (min)</translation>
-    </message>
-    <message>
-        <source>E</source>
-        <translation type="obsolete">E</translation>
-    </message>
-    <message>
-        <source>EAN%d</source>
-        <translation type="obsolete">EAN%d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Redigera</translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Ändra Enhetsnamn</translation>
-    </message>
-    <message>
-        <source>Edit Dive Computer Nicknames</source>
-        <translation type="obsolete">Ändra dykdatorers namn</translation>
-    </message>
-    <message>
-        <source>Edit Trip Info</source>
-        <translation type="obsolete">Ändra reseinformation</translation>
-    </message>
-    <message>
-        <source>Edit Trip Summary</source>
-        <translation type="obsolete">Ändra resesammandrag</translation>
-    </message>
-    <message>
-        <source>Edit a dive computer nickname by double-clicking it in the relevant nickname field</source>
-        <translation type="obsolete">Ändra dykdatorns namn genom att dubbel-klicka på namnfältet</translation>
-    </message>
-    <message>
-        <source>Edit dive</source>
-        <translation type="obsolete">Redigera dyk</translation>
-    </message>
-    <message>
-        <source>Edit dive date/time</source>
-        <translation type="obsolete">Redigera dyk datum/tid</translation>
-    </message>
-    <message>
-        <source>Edit dives</source>
-        <translation type="obsolete">Redigera dyk</translation>
-    </message>
-    <message>
-        <source>Edit multiple dives</source>
-        <translation type="obsolete">Redigera flera dyk</translation>
-    </message>
-    <message>
-        <source>Edit trip summary</source>
-        <translation type="obsolete">Redigera resesammandrag</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Events</source>
-        <translation type="obsolete">Aktivera / Inaktivera händelser</translation>
-    </message>
-    <message>
-        <source>Enable / Disable Tags</source>
-        <translation type="obsolete">Aktivera / Avaktivera taggar</translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="obsolete">Slut</translation>
-    </message>
-    <message>
-        <source>Ending Depth</source>
-        <translation type="obsolete">Slutdjup</translation>
-    </message>
-    <message>
-        <source>Enter a user identifier and press &apos;Download&apos;. Once the download is complete you can press &apos;Apply&apos; if you wish to apply the changes.</source>
-        <translation type="obsolete">Ange ditt användarid och tryck &apos;Ladda ner&apos;. När laddningen är färdig kan du trycka på &apos;Använd&apos; för att använda data</translation>
-    </message>
-    <message>
-        <source>Equipment</source>
-        <translation type="obsolete">Utrustning</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Error</translation>
-    </message>
-    <message>
-        <source>Error obtaining water salinity</source>
-        <translation type="obsolete">Kunde inte ladda vattnets salthalt</translation>
-    </message>
-    <message>
-        <source>Error parsing the datetime</source>
-        <translation type="obsolete">Kunde inte tolka tid och datum</translation>
-    </message>
-    <message>
-        <source>Error parsing the divetime</source>
-        <translation type="obsolete">Kunde inte tolka dyktid</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix</source>
-        <translation type="obsolete">Kunde inte tolka gasblandning</translation>
-    </message>
-    <message>
-        <source>Error parsing the gas mix count</source>
-        <translation type="obsolete">Kunde inte tolka antal gasblandningar</translation>
-    </message>
-    <message>
-        <source>Error parsing the maxdepth</source>
-        <translation type="obsolete">Kunde inte tolka maxdjup</translation>
-    </message>
-    <message>
-        <source>Error parsing the samples</source>
-        <translation type="obsolete">Kunde inte tolka sampel</translation>
-    </message>
-    <message>
-        <source>Error registering the cancellation handler.</source>
-        <translation type="obsolete">Kunde inte registrera avbrytningsrutin</translation>
-    </message>
-    <message>
-        <source>Error registering the data</source>
-        <translation type="obsolete">Kunde inte registrera parser-data</translation>
-    </message>
-    <message>
-        <source>Error registering the event handler.</source>
-        <translation type="obsolete">Kunde inte registrera event-funktion</translation>
-    </message>
-    <message>
-        <source>Event: systime=%&lt;PRId64&gt;, devtime=%u
-</source>
-        <translation type="obsolete">Event: systime=%&lt;PRId64&gt;, devtime=%u
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Event: waiting for user action</source>
-        <translation type="obsolete">Händelse: väntar på användaren</translation>
-    </message>
-    <message>
-        <source>Expand all</source>
-        <translation type="obsolete">Expandera alla</translation>
-    </message>
-    <message>
-        <source>Export As UDDF File</source>
-        <translation type="obsolete">Exportera som UDDF fil</translation>
-    </message>
-    <message>
-        <source>Export UDDF...</source>
-        <translation type="obsolete">Exportera UDDF...</translation>
-    </message>
-    <message>
-        <source>Export dive(s) to UDDF</source>
-        <translation type="obsolete">Exportera dyk till UDDF</translation>
-    </message>
-    <message>
-        <source>Fahrenheit</source>
-        <translation type="obsolete">Fahrenheit</translation>
-    </message>
-    <message>
-        <source>Failed to open %i files.</source>
-        <translation type="obsolete">Kunde inte öppna %i filer.</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="obsolete">Kunde inte läsa &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to parse &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Kunde inte läsa &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation type="obsolete">Kunde inte öppna &apos;%s&apos;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Failed to read &apos;%s&apos;.
-</source>
-        <translation type="obsolete">Kunde inte öppna &apos;%s&apos;.
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Feb</source>
-        <translation type="obsolete">feb</translation>
-    </message>
-    <message>
-        <source>Feet</source>
-        <translation type="obsolete">fot</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Fil</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filter</translation>
-    </message>
-    <message>
-        <source>Force download of all dives</source>
-        <translation type="obsolete">Tvinga nedladdning av alla dyk</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">fre</translation>
-    </message>
-    <message>
-        <source>GFhigh</source>
-        <translation type="obsolete">GFhigh</translation>
-    </message>
-    <message>
-        <source>GFhigh for plan</source>
-        <translation type="obsolete">GFhigh för dykplanering</translation>
-    </message>
-    <message>
-        <source>GFlow</source>
-        <translation type="obsolete">GFlow</translation>
-    </message>
-    <message>
-        <source>GFlow for plan</source>
-        <translation type="obsolete">GFlow för dykplanering</translation>
-    </message>
-    <message>
-        <source>GPS (WGS84 or GPS format)</source>
-        <translation type="obsolete">GPS (WGS84 eller GPS format)</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <extracomment>++GETTEXT Gas Used is amount used
-</extracomment>
-        <translation type="obsolete">Gasanvändning</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Amount</comment>
-        <translation type="obsolete">Gasanvändning</translation>
-    </message>
-    <message>
-        <source>Gas Used</source>
-        <comment>Type of</comment>
-        <translation type="obsolete">Gasanvändning</translation>
-    </message>
-    <message>
-        <source>Gas consumption:
-</source>
-        <translation type="obsolete">Gasanvändning:
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Gasmix</source>
-        <translation type="obsolete">Gasblandning</translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Allmänna Iinställningar</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Hjälp</translation>
-    </message>
-    <message>
-        <source>Idle</source>
-        <translation type="obsolete">Idle</translation>
-    </message>
-    <message>
-        <source>Import File(s)...</source>
-        <translation type="obsolete">Importera fil(er)...</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Info</translation>
-    </message>
-    <message>
-        <source>Init Communication</source>
-        <translation type="obsolete">Initierar anslutning</translation>
-    </message>
-    <message>
-        <source>Input Plan</source>
-        <translation type="obsolete">Skriv plan</translation>
-    </message>
-    <message>
-        <source>Invalid depth - could not parse &quot;%s&quot;</source>
-        <translation type="obsolete">Ogiltigt djup - kunde inte tolka  &quot;%s&quot;</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid depth - values deeper than 400m not supported</source>
-        <translation type="obsolete">Ogiltigt djup - värden djupare än 400m stöds inte</translation>
-    </message>
-    <message>
-        <source>Invalid gas for row %d</source>
-        <translation type="obsolete">Ogiltig gas för rad %d</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Invalid starttime</source>
-        <translation type="obsolete">Ogiltig starttid</translation>
-    </message>
-    <message>
-        <source>Invalid user identifier!</source>
-        <translation type="obsolete">Ogiltigt användarid!</translation>
-    </message>
-    <message>
-        <source>Jan</source>
-        <extracomment>++GETTEXT: these are three letter months - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">jan</translation>
-    </message>
-    <message>
-        <source>Jul</source>
-        <translation type="obsolete">jul</translation>
-    </message>
-    <message>
-        <source>Jun</source>
-        <translation type="obsolete">jun</translation>
-    </message>
-    <message>
-        <source>Last stop at 20 Feet</source>
-        <translation type="obsolete">Sista stoppet vid 20 Fot</translation>
-    </message>
-    <message>
-        <source>Last stop at 6 Meters</source>
-        <translation type="obsolete">Sista stoppet vid 6 Meter</translation>
-    </message>
-    <message>
-        <source>Layout Options</source>
-        <translation type="obsolete">Layout Optioner</translation>
-    </message>
-    <message>
-        <source>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</source>
-        <translation type="obsolete">Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Lista</translation>
-    </message>
-    <message>
-        <source>Liter</source>
-        <translation type="obsolete">liter</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Plats</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>Longest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Längsta</translation>
-    </message>
-    <message>
-        <source>Longest Dive</source>
-        <translation type="obsolete">Längsta dyk</translation>
-    </message>
-    <message>
-        <source>Low Battery Alert</source>
-        <translation type="obsolete">Batterivarning</translation>
-    </message>
-    <message>
-        <source>Low Battery Warning</source>
-        <translation type="obsolete">Batterivarning</translation>
-    </message>
-    <message>
-        <source>Map provider</source>
-        <translation type="obsolete">Kartleverantör</translation>
-    </message>
-    <message>
-        <source>Mar</source>
-        <translation type="obsolete">mar</translation>
-    </message>
-    <message>
-        <source>Mark invalid</source>
-        <translation type="obsolete">Märk som ogiltig</translation>
-    </message>
-    <message>
-        <source>Mark location here</source>
-        <translation type="obsolete">Markera platsen här</translation>
-    </message>
-    <message>
-        <source>Mark valid</source>
-        <translation type="obsolete">Märk som giltig</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation type="obsolete">markering</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete">master</translation>
-    </message>
-    <message>
-        <source>Max Deco Time Warning</source>
-        <translation type="obsolete">Varning: max dekotid</translation>
-    </message>
-    <message>
-        <source>Max Depth</source>
-        <translation type="obsolete">Maxdjup</translation>
-    </message>
-    <message>
-        <source>Max Depth (%s):</source>
-        <translation type="obsolete">Maxdjup (%s):</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max SAC</source>
-        <translation type="obsolete">Max SAC</translation>
-    </message>
-    <message>
-        <source>Max Temp</source>
-        <translation type="obsolete">Max temp</translation>
-    </message>
-    <message>
-        <source>Max depth: %.*f %s
-Duration: %d min
-%s</source>
-        <translation type="obsolete">Maxdjup: %.*f %s
-Tid: %d min
-%s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Max. CNS</source>
-        <translation type="obsolete">Max. CNS</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>MaxPress</source>
-        <translation type="obsolete">Max tryck</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Maximum</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Maximum</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Maximum</translation>
-    </message>
-    <message>
-        <source>May</source>
-        <translation type="obsolete">maj</translation>
-    </message>
-    <message>
-        <source>Merge dives</source>
-        <translation type="obsolete">Sammanslå dyk</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Sammanfoga resa med tidigare resa</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Sammanfoga resa med senare resa</translation>
-    </message>
-    <message>
-        <source>Meter</source>
-        <translation type="obsolete">meter</translation>
-    </message>
-    <message>
-        <source>Min Depth</source>
-        <translation type="obsolete">Min. djup</translation>
-    </message>
-    <message>
-        <source>Min SAC</source>
-        <translation type="obsolete">Min. SAC</translation>
-    </message>
-    <message>
-        <source>Min Temp</source>
-        <translation type="obsolete">Min. temp</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Depth</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>SAC</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <comment>Temp</comment>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>Misc. Options</source>
-        <translation type="obsolete">Diverse inställningar</translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="obsolete">Modell</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">mån</translation>
-    </message>
-    <message>
-        <source>Multi-platform divelog software in C</source>
-        <translation type="obsolete">Dyklogg i C för flera plattformar</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Ny</translation>
-    </message>
-    <message>
-        <source>New starting number</source>
-        <translation type="obsolete">Nytt startnummer</translation>
-    </message>
-    <message>
-        <source>Next DC</source>
-        <translation type="obsolete">Nästa dykdator</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Enhetsnamn</translation>
-    </message>
-    <message>
-        <source>No Tank Data</source>
-        <translation type="obsolete">Ingen flaskinformation</translation>
-    </message>
-    <message>
-        <source>No cylinders listed for this dive.</source>
-        <translation type="obsolete">Inga flaskor listade för detta dyk.</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Anteckningar</translation>
-    </message>
-    <message>
-        <source>Notes height (%d%% - %d%%)</source>
-        <translation type="obsolete">Anteckningar höjd (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Notes on top</source>
-        <translation type="obsolete">Anteckningar ovanpå</translation>
-    </message>
-    <message>
-        <source>Nov</source>
-        <translation type="obsolete">nov</translation>
-    </message>
-    <message>
-        <source>OLF</source>
-        <translation type="obsolete">OLF</translation>
-    </message>
-    <message>
-        <source>OTU</source>
-        <translation type="obsolete">OTU</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oct</source>
-        <translation type="obsolete">okt</translation>
-    </message>
-    <message>
-        <source>Odd pthread error return</source>
-        <translation type="obsolete">Konstig felreturn from pthread</translation>
-    </message>
-    <message>
-        <source>Ok to delete the selected entry?</source>
-        <translation type="obsolete">Ok att radera?</translation>
-    </message>
-    <message>
-        <source>Only display dives with these tags:</source>
-        <translation type="obsolete">Visa endast dyk med dessa taggar:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Öppna fil</translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="obsolete">Öppna...</translation>
-    </message>
-    <message>
-        <source>Ordering</source>
-        <translation type="obsolete">Sortering</translation>
-    </message>
-    <message>
-        <source>Other data height (%d%% - %d%%)</source>
-        <translation type="obsolete">Höjd på övriga uppgifter (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Syre</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>PO2</source>
-        <translation type="obsolete">PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="obsolete">Alarm: uppstigning / PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Ascend Warning</source>
-        <translation type="obsolete">Varning: uppstigning / PO2</translation>
-    </message>
-    <message>
-        <source>PO2 Green Warning</source>
-        <translation type="obsolete">Varning: grön PO2</translation>
-    </message>
-    <message>
-        <source>PSI</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Lösenord</translation>
-    </message>
-    <message>
-        <source>Pick on map</source>
-        <translation type="obsolete">Välj från karta</translation>
-    </message>
-    <message>
-        <source>Planner</source>
-        <translation type="obsolete">Planerare</translation>
-    </message>
-    <message>
-        <source>Please enter your userid and password for divelogs.de. The selected dives will be added to your account</source>
-        <translation type="obsolete">Vänligen ange ditt användarnamn och lösenord för divelogs.de. De markerade dyken kommer att läggas till ditt konto.</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="obsolete">Inställningar</translation>
-    </message>
-    <message>
-        <source>Preferences...</source>
-        <translation type="obsolete">Inställningar...</translation>
-    </message>
-    <message>
-        <source>Pressure</source>
-        <translation type="obsolete">Tryck</translation>
-    </message>
-    <message>
-        <source>Pressure:</source>
-        <translation type="obsolete">Tryck:</translation>
-    </message>
-    <message>
-        <source>Prev DC</source>
-        <translation type="obsolete">Föregående dykdator</translation>
-    </message>
-    <message>
-        <source>Print in color</source>
-        <translation type="obsolete">Skriv ut i färg</translation>
-    </message>
-    <message>
-        <source>Print only selected dives</source>
-        <translation type="obsolete">Skriv ut valda dyk</translation>
-    </message>
-    <message>
-        <source>Print selection</source>
-        <translation type="obsolete">Skriv ut valda dyk</translation>
-    </message>
-    <message>
-        <source>Print type</source>
-        <translation type="obsolete">Utskriftstyp</translation>
-    </message>
-    <message>
-        <source>Print...</source>
-        <translation type="obsolete">Skriv ut...</translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="obsolete">Profil</translation>
-    </message>
-    <message>
-        <source>Profile Settings</source>
-        <translation type="obsolete">Profilinställningar</translation>
-    </message>
-    <message>
-        <source>Profile height (%d%% - %d%%)</source>
-        <translation type="obsolete">Profilhöjd (%d%% - %d%%)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Profile on top</source>
-        <translation type="obsolete">Profil ovanpå</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Avsluta</translation>
-    </message>
-    <message>
-        <source>RGT Alert</source>
-        <translation type="obsolete">Varning: gastid</translation>
-    </message>
-    <message>
-        <source>RGT Warning</source>
-        <translation type="obsolete">Varning: gastid</translation>
-    </message>
-    <message>
-        <source>Rating</source>
-        <translation type="obsolete">Rankning</translation>
-    </message>
-    <message>
-        <source>Reading %s %s</source>
-        <translation type="obsolete">Läser %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Ta bort</translation>
-    </message>
-    <message>
-        <source>Remove Trip</source>
-        <translation type="obsolete">Radera resa</translation>
-    </message>
-    <message>
-        <source>Remove dive from trip</source>
-        <translation type="obsolete">Ta bort dyk från resa</translation>
-    </message>
-    <message>
-        <source>Remove event here</source>
-        <translation type="obsolete">Ta bort händelse</translation>
-    </message>
-    <message>
-        <source>Remove selected dives from trip</source>
-        <translation type="obsolete">Ta bort valda dyk från resa</translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Uppdatera numrering</translation>
-    </message>
-    <message>
-        <source>Renumber...</source>
-        <translation type="obsolete">Uppdatera numrering...</translation>
-    </message>
-    <message>
-        <source>Retry</source>
-        <translation type="obsolete">Försök igen</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>SAC</source>
-        <translation type="obsolete">SAC</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>SAC during decostop</source>
-        <translation type="obsolete">SAC under dekostopp</translation>
-    </message>
-    <message>
-        <source>SAC during dive</source>
-        <translation type="obsolete">SAC under dyk</translation>
-    </message>
-    <message>
-        <source>Safety Stop Violation</source>
-        <translation type="obsolete">Säkerhetsstopp ej uppfyllt</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">lör</translation>
-    </message>
-    <message>
-        <source>Save As...</source>
-        <translation type="obsolete">Spara som...</translation>
-    </message>
-    <message>
-        <source>Save Changes?</source>
-        <translation type="obsolete">Spara ändringar?</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="obsolete">Spara fil som</translation>
-    </message>
-    <message>
-        <source>Save as</source>
-        <translation type="obsolete">Spara som</translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="obsolete">Spara...</translation>
-    </message>
-    <message>
-        <source>Segment Time</source>
-        <translation type="obsolete">Segment-tid</translation>
-    </message>
-    <message>
-        <source>Select Events</source>
-        <translation type="obsolete">Välj händelser</translation>
-    </message>
-    <message>
-        <source>Select Events...</source>
-        <translation type="obsolete">Välj händelser...</translation>
-    </message>
-    <message>
-        <source>Select Tags...</source>
-        <translation type="obsolete">Välj taggar...</translation>
-    </message>
-    <message>
-        <source>Sep</source>
-        <translation type="obsolete">sep</translation>
-    </message>
-    <message>
-        <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="obsolete">Kunde inte skriva filen req.txt
-Är Uemis Zurich ordentligt ansluten?</translation>
-    </message>
-    <message>
-        <source>Shortest</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Kortaste</translation>
-    </message>
-    <message>
-        <source>Shortest Dive</source>
-        <translation type="obsolete">Kortaste dyk</translation>
-    </message>
-    <message>
-        <source>Show Columns</source>
-        <translation type="obsolete">Visa kolumner</translation>
-    </message>
-    <message>
-        <source>Show EAD, END, EADD</source>
-        <translation type="obsolete">Visa EAD, END, EADD</translation>
-    </message>
-    <message>
-        <source>Show MOD</source>
-        <translation type="obsolete">Visa MOD</translation>
-    </message>
-    <message>
-        <source>Show calculated ceiling</source>
-        <translation type="obsolete">Visa beräknad tak-information</translation>
-    </message>
-    <message>
-        <source>Show dc reported ceiling in red</source>
-        <translation type="obsolete">Visa takinformationen i rött</translation>
-    </message>
-    <message>
-        <source>Show in map</source>
-        <translation type="obsolete">Visa på kartan</translation>
-    </message>
-    <message>
-        <source>Show pHe graph</source>
-        <translation type="obsolete">Visa pHe graf</translation>
-    </message>
-    <message>
-        <source>Show pN%s graph</source>
-        <translation type="obsolete">Visa pN%s graf</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Show pO%s graph</source>
-        <translation type="obsolete">Visa pO%s graph</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simulerat dyk</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Storlek</translation>
-    </message>
-    <message>
-        <source>Sizing heights (%% of layout)</source>
-        <translation type="obsolete">Dimensionering av höjder (%% av layout)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Speed Alarm</source>
-        <translation type="obsolete">Alarm: uppstigningshastighet</translation>
-    </message>
-    <message>
-        <source>Speed Warning</source>
-        <translation type="obsolete">Varning: uppstigningshastighet</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Start</translation>
-    </message>
-    <message>
-        <source>Start download</source>
-        <translation type="obsolete">Starta nedladdningen</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation type="obsolete">Statistik</translation>
-    </message>
-    <message>
-        <source>Statistics %s</source>
-        <translation type="obsolete">Statistik %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Stats</source>
-        <translation type="obsolete">Statistik</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Status</translation>
-    </message>
-    <message>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Stanna vid %.*f %s för %d:%02d min - totaltid %d:%02u on %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Strange percentage reading %s
-</source>
-        <translation type="obsolete">Konstig procent läsning %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Suit</source>
-        <translation type="obsolete">Dräkt</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <extracomment>++GETTEXT: these are three letter days - we allow up to six code bytes
-</extracomment>
-        <translation type="obsolete">sön</translation>
-    </message>
-    <message>
-        <source>Surf Intv</source>
-        <translation type="obsolete">Ytintervall</translation>
-    </message>
-    <message>
-        <source>Surface Pressure (mbar)</source>
-        <translation type="obsolete">Lufttryck på ytan (mbar)</translation>
-    </message>
-    <message>
-        <source>Switch gas to %s
-</source>
-        <translation type="obsolete">Byt till gas %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Table print</source>
-        <translation type="obsolete">Tabellutskrift</translation>
-    </message>
-    <message>
-        <source>Tags are only shown if they are identical for all edited dives</source>
-        <translation type="obsolete">Taggar visas bara om de är identiska för alla dyk</translation>
-    </message>
-    <message>
-        <source>Tank Change Suggested</source>
-        <translation type="obsolete">Tankbyte rekommenderat</translation>
-    </message>
-    <message>
-        <source>Tank Pressure Info</source>
-        <translation type="obsolete">Info: flasktryck</translation>
-    </message>
-    <message>
-        <source>Tec Settings</source>
-        <translation type="obsolete">Tekniska inställningar</translation>
-    </message>
-    <message>
-        <source>Temp</source>
-        <translation type="obsolete">Temp</translation>
-    </message>
-    <message>
-        <source>Temperature</source>
-        <translation type="obsolete">Temperatur</translation>
-    </message>
-    <message>
-        <source>Temperature:</source>
-        <translation type="obsolete">Temperatur:</translation>
-    </message>
-    <message>
-        <source>Three</source>
-        <translation type="obsolete">Alla</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">tor</translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="obsolete">Tid</translation>
-    </message>
-    <message>
-        <source>To edit dive information
-double click on it in the dive list</source>
-        <translation type="obsolete">Dubbelklicka på dyklistan för att ändra dykinformation</translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zoom av/på</translation>
-    </message>
-    <message>
-        <source>Too many gas mixes</source>
-        <translation type="obsolete">För många gasblandningar</translation>
-    </message>
-    <message>
-        <source>Too many waypoints</source>
-        <translation type="obsolete">För många etapper</translation>
-    </message>
-    <message>
-        <source>Total</source>
-        <comment>Duration</comment>
-        <translation type="obsolete">Total</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation type="obsolete">Total tid</translation>
-    </message>
-    <message>
-        <source>Total Weight:</source>
-        <translation type="obsolete">Total vikt:</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="obsolete">Dyk till %.*f %s i %d:%02d min - totaltid %d:%02u on %s
-</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message numerus="yes">
-        <source>Trip %1$s, %2$s %3$d, %4$d (%5$d dive)</source>
-        <extracomment>++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-</extracomment>
-        <translation type="obsolete">
-            <numerusform>Resa %1$s, %3$d %2$s, %4$d (%5$d dyk)</numerusform>
-        </translation>
-        <extra-po-msgid_plural>Trip %1$s, %2$s %3$d, %4$d (%5$d dives)</extra-po-msgid_plural>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">tis</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Typ</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
-        <translation type="obsolete">Uemis Zurich: Filsystem är nästan fullt
-Återanslut dykdatorn och försök
-igen</translation>
-    </message>
-    <message>
-        <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
-        <translation type="obsolete">Uemis Zurich: Fullt filsystem
-Återanslut dykdatorn och försök
-igen</translation>
-    </message>
-    <message>
-        <source>Uemis init failed</source>
-        <translation type="obsolete">Kunde inte läsa från Uemis</translation>
-    </message>
-    <message>
-        <source>Unable to create libdivecomputer context</source>
-        <translation type="obsolete">Kan inte skapa libdivecomputer context</translation>
-    </message>
-    <message>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="obsolete">Kan inte skapa parser för %s %s</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Unable to open %s %s (%s)</source>
-        <translation type="obsolete">Kunde inte öppna fil %s %s (%s)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Units</source>
-        <translation type="obsolete">Enheter</translation>
-    </message>
-    <message>
-        <source>Upload dive(s) to divelogs.de</source>
-        <translation type="obsolete">Ladda upp dyk till divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de</source>
-        <translation type="obsolete">Ladda upp till divelogs.de</translation>
-    </message>
-    <message>
-        <source>Upload to divelogs.de...</source>
-        <translation type="obsolete">Ladda upp till divelogs.de...</translation>
-    </message>
-    <message>
-        <source>Use right click to mark dive location at cursor</source>
-        <translation type="obsolete">Högerklicka för att markera dykmål vid muspekaren</translation>
-    </message>
-    <message>
-        <source>User Identifier</source>
-        <translation type="obsolete">Användar ID</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Användarmanual</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Visa</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="obsolete">Synlighet</translation>
-    </message>
-    <message>
-        <source>Volume:</source>
-        <translation type="obsolete">Volym:</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="obsolete">W</translation>
-    </message>
-    <message>
-        <source>Warning - extremely long dives can cause long calculation time</source>
-        <translation type="obsolete">Varning - extremt långa dyk kan ta lång tid att beräkna</translation>
-    </message>
-    <message>
-        <source>Warning - planning very deep dives can take excessive amounts of time</source>
-        <translation type="obsolete">Varning - att planera väldigt djupa dyk kan ta väldigt lång tid</translation>
-    </message>
-    <message>
-        <source>Water Temp</source>
-        <translation type="obsolete">Vattentemperatur</translation>
-    </message>
-    <message>
-        <source>Webservice</source>
-        <translation type="obsolete">Webbtjänst</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">ons</translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="obsolete">Vikt</translation>
-    </message>
-    <message>
-        <source>Weight System</source>
-        <translation type="obsolete">Viktsystem</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Vikt:</translation>
-    </message>
-    <message>
-        <source>XML file</source>
-        <translation type="obsolete">XML-fil</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">År</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Årsstatistik</translation>
-    </message>
-    <message>
-        <source>You already have a dive computer of this model
-named %s
-Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.
-If you don&apos;t want to name this dive computer click &apos;Cancel&apos; and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs).</source>
-        <translation type="obsolete">Du äger redan en dydator av denna modell
-med namnet %s
-Subsurface kan namnge den nya dykdatorn så att du kan lätt skilja dem åt. Det förvalda namnet är modellen och enhetens ID som visas nedan.
-Om du inte vill ge ett nytt namn åt datorn, tryck &apos;Avbryt&apos;. Subsurface kommer att endast visa modellnamnet (vilket kan göra det svårt att skilja två dykdatorer av samma modell).</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>You have unsaved changes
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Du har ändringer som inte är sparade.
-Vill du spara dem innan du stänger datafilen?</translation>
-    </message>
-    <message>
-        <source>You have unsaved changes to file: %s 
-Would you like to save those before closing the datafile?</source>
-        <translation type="obsolete">Du har ändringer som inte är sparade i %s.
-Vill du spara dem innan du stänger datafilen?</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>air</source>
-        <translation type="obsolete">luft</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>airtime</source>
-        <translation type="obsolete">gastid</translation>
-    </message>
-    <message>
-        <source>altitude</source>
-        <translation type="obsolete">höjd</translation>
-    </message>
-    <message>
-        <source>ankle</source>
-        <translation type="obsolete">ankel</translation>
-    </message>
-    <message>
-        <source>ascent</source>
-        <translation type="obsolete">uppstigning</translation>
-    </message>
-    <message>
-        <source>backplate weight</source>
-        <translation type="obsolete">Ryggplattans vikt</translation>
-    </message>
-    <message>
-        <source>bar</source>
-        <translation type="obsolete">bar</translation>
-    </message>
-    <message>
-        <source>belt</source>
-        <translation type="obsolete">bälte</translation>
-    </message>
-    <message>
-        <source>boat</source>
-        <translation type="obsolete">båt</translation>
-    </message>
-    <message>
-        <source>bookmark</source>
-        <translation type="obsolete">bokmärke</translation>
-    </message>
-    <message>
-        <source>cave</source>
-        <translation type="obsolete">grotta</translation>
-    </message>
-    <message>
-        <source>cavern</source>
-        <translation type="obsolete">cavern</translation>
-    </message>
-    <message>
-        <source>ceiling</source>
-        <translation type="obsolete">ceiling</translation>
-    </message>
-    <message>
-        <source>ceiling (safety stop)</source>
-        <translation type="obsolete">ceiling (säkerhetsstopp)</translation>
-    </message>
-    <message>
-        <source>clip-on</source>
-        <translation type="obsolete">clip-on</translation>
-    </message>
-    <message>
-        <source>cuft</source>
-        <translation type="obsolete">ft³</translation>
-    </message>
-    <message>
-        <source>data</source>
-        <translation type="obsolete">data</translation>
-    </message>
-    <message>
-        <source>deco</source>
-        <translation type="obsolete">deko</translation>
-    </message>
-    <message>
-        <source>deco stop</source>
-        <translation type="obsolete">dekostopp</translation>
-    </message>
-    <message>
-        <source>deep</source>
-        <translation type="obsolete">djup</translation>
-    </message>
-    <message>
-        <source>deepstop</source>
-        <translation type="obsolete">djupstopp</translation>
-    </message>
-    <message>
-        <source>divelog entry id</source>
-        <translation type="obsolete">dyklog ID</translation>
-    </message>
-    <message>
-        <source>divespot data id</source>
-        <translation type="obsolete">dykplats ID</translation>
-    </message>
-    <message>
-        <source>divetime</source>
-        <translation type="obsolete">dyktid</translation>
-    </message>
-    <message>
-        <source>drift</source>
-        <translation type="obsolete">ström</translation>
-    </message>
-    <message>
-        <source>drysuit</source>
-        <translation type="obsolete">torrdräkt</translation>
-    </message>
-    <message>
-        <source>ean</source>
-        <translation type="obsolete">ean</translation>
-    </message>
-    <message>
-        <source>for all dives</source>
-        <translation type="obsolete">för alla dyk</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dive #%d</source>
-        <translation type="obsolete">Dyk #%d </translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for dives #</source>
-        <translation type="obsolete">för dykningar #</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dive</source>
-        <translation type="obsolete">för valt dyk</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>for selected dives</source>
-        <translation type="obsolete">för utvalda dyk</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">sötvatten</translation>
-    </message>
-    <message>
-        <source>ft</source>
-        <translation type="obsolete">ft</translation>
-    </message>
-    <message>
-        <source>full suit</source>
-        <translation type="obsolete">fulldräkt</translation>
-    </message>
-    <message>
-        <source>gaschange</source>
-        <translation type="obsolete">gasbyte</translation>
-    </message>
-    <message>
-        <source>heading</source>
-        <translation type="obsolete">riktning</translation>
-    </message>
-    <message>
-        <source>ice</source>
-        <translation type="obsolete">is</translation>
-    </message>
-    <message>
-        <source>integrated</source>
-        <translation type="obsolete">integrerat</translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">ogiltig</translation>
-    </message>
-    <message>
-        <source>invalid event number</source>
-        <translation type="obsolete">okänt händelsenummer</translation>
-    </message>
-    <message>
-        <source>jacket</source>
-        <translation type="obsolete">jacka</translation>
-    </message>
-    <message>
-        <source>kg</source>
-        <translation type="obsolete">kg</translation>
-    </message>
-    <message>
-        <source>l</source>
-        <translation type="obsolete">l</translation>
-    </message>
-    <message>
-        <source>lake</source>
-        <translation type="obsolete">sjö</translation>
-    </message>
-    <message>
-        <source>lbs</source>
-        <translation type="obsolete">pund</translation>
-    </message>
-    <message>
-        <source>long john</source>
-        <translation type="obsolete">Longjohn</translation>
-    </message>
-    <message>
-        <source>m</source>
-        <translation type="obsolete">m</translation>
-    </message>
-    <message>
-        <source>max ppO2</source>
-        <translation type="obsolete">max ppO2</translation>
-    </message>
-    <message>
-        <source>maxCNS</source>
-        <translation type="obsolete">maxCNS</translation>
-    </message>
-    <message>
-        <source>maxdepth</source>
-        <translation type="obsolete">Maxdjup</translation>
-    </message>
-    <message>
-        <source>membrane</source>
-        <translation type="obsolete">membran</translation>
-    </message>
-    <message>
-        <source>min</source>
-        <translation type="obsolete">Min</translation>
-    </message>
-    <message>
-        <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="obsolete">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>more data dive id</source>
-        <translation type="obsolete">mer data dive id</translation>
-    </message>
-    <message>
-        <source>more than %d days</source>
-        <translation type="obsolete">mer än %d dagar</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>night</source>
-        <translation type="obsolete">natt</translation>
-    </message>
-    <message>
-        <source>non stop time</source>
-        <translation type="obsolete">non stop tid</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="obsolete">inget</translation>
-    </message>
-    <message>
-        <source>pHe threshold</source>
-        <translation type="obsolete">pHe tröskel</translation>
-    </message>
-    <message>
-        <source>pN%s threshold</source>
-        <translation type="obsolete">pN%s tröskel</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pO%s threshold</source>
-        <translation type="obsolete">pO%s tröskel</translation>
-        <extra-po-flags>c-format</extra-po-flags>
-    </message>
-    <message>
-        <source>pascal</source>
-        <translation type="obsolete">pascal</translation>
-    </message>
-    <message>
-        <source>photo</source>
-        <translation type="obsolete">foto</translation>
-    </message>
-    <message>
-        <source>pool</source>
-        <translation type="obsolete">pool</translation>
-    </message>
-    <message>
-        <source>psi</source>
-        <translation type="obsolete">psi</translation>
-    </message>
-    <message>
-        <source>rbt</source>
-        <translation type="obsolete">rbt</translation>
-    </message>
-    <message>
-        <source>rgbm</source>
-        <translation type="obsolete">rgbm</translation>
-    </message>
-    <message>
-        <source>river</source>
-        <translation type="obsolete">älv</translation>
-    </message>
-    <message>
-        <source>safety stop</source>
-        <translation type="obsolete">säkerhetsstopp</translation>
-    </message>
-    <message>
-        <source>safety stop (mandatory)</source>
-        <translation type="obsolete">säkerhetsstopp (obligatoriskt)</translation>
-    </message>
-    <message>
-        <source>safety stop (voluntary)</source>
-        <translation type="obsolete">säkerhetsstopp (frivilligt)</translation>
-    </message>
-    <message>
-        <source>semidry</source>
-        <translation type="obsolete">semidry</translation>
-    </message>
-    <message>
-        <source>shore</source>
-        <translation type="obsolete">strand</translation>
-    </message>
-    <message>
-        <source>shorty</source>
-        <translation type="obsolete">shorty</translation>
-    </message>
-    <message>
-        <source>surface</source>
-        <translation type="obsolete">ytan</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">undervisning</translation>
-    </message>
-    <message>
-        <source>tissue level warning</source>
-        <translation type="obsolete">vävnadsnivå</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">utbildning</translation>
-    </message>
-    <message>
-        <source>translator-credits</source>
-        <extracomment>++GETTEXT the term translator-credits is magic - list the names of the
-tranlators here
-</extracomment>
-        <translation type="obsolete">Linus Torvalds
-Fredrik Steen</translation>
-    </message>
-    <message>
-        <source>transmitter</source>
-        <translation type="obsolete">sändare</translation>
-    </message>
-    <message>
-        <source>unkn</source>
-        <translation type="obsolete">okänd</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">okänd</translation>
-    </message>
-    <message>
-        <source>unspecified</source>
-        <translation type="obsolete">inte specifierad</translation>
-    </message>
-    <message>
-        <source>vest</source>
-        <translation type="obsolete">väst</translation>
-    </message>
-    <message>
-        <source>video</source>
-        <translation type="obsolete">video</translation>
-    </message>
-    <message>
-        <source>violation</source>
-        <translation type="obsolete">kränkning</translation>
-    </message>
-    <message>
-        <source>weight</source>
-        <translation type="obsolete">Vikt</translation>
-    </message>
-    <message>
-        <source>wetsuit</source>
-        <translation type="obsolete">våtdräkt</translation>
-    </message>
-    <message>
-        <source>workload</source>
-        <translation type="obsolete">arbetsbelastning</translation>
-    </message>
-    <message>
-        <source>wreck</source>
-        <translation type="obsolete">vrak</translation>
-    </message>
-</context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv_SE" version="2.0">
 <context>
     <name>CSVImportDialog</name>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"></translation>
+        <translation>Importera fil (CSV)</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
         <source>Field Separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Fältavskiljare</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Fältkonfiguration</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
         <source>Time</source>
-        <translation type="unfinished">Tid</translation>
+        <translation>Tid</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
         <source>Depth</source>
-        <translation type="unfinished">Djup</translation>
+        <translation>Djup</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
         <source>Temp</source>
-        <translation type="unfinished">Temp</translation>
+        <translation>Temp</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
         <source>Po2</source>
-        <translation type="unfinished"></translation>
+        <translation>Po2</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
         <source>Cns</source>
-        <translation type="unfinished"></translation>
+        <translation>Cns</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
+        <translation>Stoppdjup</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
+        <translation>Förkonfigurerade importer</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"></translation>
+        <translation>Öppna CSV loggfil</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"></translation>
+        <translation>CSV Filer (*.csv)</translation>
     </message>
 </context>
 <context>
@@ -2385,57 +77,57 @@ Fredrik Steen</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
-        <translation type="unfinished">Storlek</translation>
+        <translation>Storlek</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Arbetstryck</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Starttryck</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation>Sluttryck</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"></translation>
+        <translation>O2%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"></translation>
+        <translation>HE</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"></translation>
+        <translation>Byt vid</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicka här för att ta bort denna flaska</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"></translation>
+        <translation>Flaska kan inte tas bort</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Denna gas används. Bara flaskor som inte används kan tas bort</translation>
     </message>
 </context>
 <context>
@@ -2443,41 +135,42 @@ Fredrik Steen</translation>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished">Ändra dykdatorers namn</translation>
+        <translation>Ändra dykdatorers namn</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation>Radera vald dykdator?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation>Är du säker på att du vill
+radera den valda dykdatorn?</translation>
     </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <source>Model</source>
+        <translation>Modell</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
-        <source>Model</source>
-        <translation type="unfinished">Modell</translation>
+        <source>Device ID</source>
+        <translation>Enhetsid</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
-        <translation type="unfinished">Enhetsnamn</translation>
+        <translation>Enhetsnamn</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicka här för att ta bort denna dykdator</translation>
     </message>
 </context>
 <context>
@@ -2485,12 +178,12 @@ Fredrik Steen</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"></translation>
+        <translation> l/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"></translation>
+        <translation> cuft/min</translation>
     </message>
 </context>
 <context>
@@ -2498,95 +191,87 @@ Fredrik Steen</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"></translation>
+        <translation>Visa sökruta</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"></translation>
+        <translation>Expandera alla</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"></translation>
+        <translation>Sammanslå alla</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"></translation>
+        <translation>kollapsa andra</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"></translation>
+        <translation>ta bort dyk från resmål</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"></translation>
+        <translation>skapa nytt resmål ovan</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"></translation>
+        <translation>lägg till dyk till resmål direkt ovan</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"></translation>
+        <translation>sammanfoga resmål med resmål ovan</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"></translation>
+        <translation>sammanfoga resmål med resmål nedan</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>radera dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"></translation>
+        <translation>Spara som</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportera som UDDF fil</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <translation>skifta tider</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <translation>Spara dyk som...</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation>Spara fil som</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge trip with trip above</source>
-        <translation type="obsolete">Sammanfoga resa med tidigare resa</translation>
-    </message>
-    <message>
-        <source>Merge trip with trip below</source>
-        <translation type="obsolete">Sammanfoga resa med senare resa</translation>
+        <translation>UDDF filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation>Sammanslå dyk</translation>
     </message>
 </context>
 <context>
@@ -2594,48 +279,48 @@ Fredrik Steen</translation>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Form</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="74"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
+        <translation>Botten SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="88"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>SAC på DEKOSTOP</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="81"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="101"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="108"/>
         <location filename="../qt-ui/diveplanner.ui" line="121"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="131"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <translation>Sista stoppet på 6m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="180"/>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Starttid</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="187"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Atmosfärstryck</translation>
     </message>
 </context>
 <context>
@@ -2643,23 +328,24 @@ Fredrik Steen</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"></translation>
+        <translation>10m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation>30ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Hantera possitionsfel</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ett eller flera av dina stop försvinner med denna operation
+vänligen ta bort dessa först.</translation>
     </message>
 </context>
 <context>
@@ -2667,37 +353,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="467"/>
         <source>AIR</source>
-        <translation type="unfinished">LUFT</translation>
+        <translation>LUFT</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Slutdjup</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished">Varaktighet</translation>
+        <translation>Varaktighet</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"></translation>
+        <translation>Använd gas</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"></translation>
+        <translation>CC Set Point</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"></translation>
+        <translation>Kassera plan?</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"></translation>
+        <translation>Du kommer kassera din plan</translation>
     </message>
 </context>
 <context>
@@ -2705,17 +391,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"></translation>
+        <translation>Dykplaneringspunkter</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"></translation>
+        <translation>Tillgängliga gaser</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"></translation>
+        <translation>lägg till dykdatapunkt</translation>
     </message>
 </context>
 <context>
@@ -2723,67 +409,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
-        <translation type="unfinished">Min</translation>
+        <translation>Min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
-        <translation type="unfinished">pund</translation>
+        <translation>pund</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
-        <translation type="unfinished">Dräkt</translation>
+        <translation>Dräkt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
-        <translation type="unfinished">Cyl</translation>
+        <translation>Cyl</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
-        <translation type="unfinished">maxCNS</translation>
+        <translation>maxCNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
-        <translation type="unfinished">Plats</translation>
+        <translation>Plats</translation>
     </message>
 </context>
 <context>
@@ -2792,17 +478,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
-        <translation type="unfinished">Error</translation>
+        <translation>Error</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
         <source>Retry</source>
-        <translation type="unfinished">Försök igen</translation>
+        <translation>Försök igen</translation>
     </message>
 </context>
 <context>
@@ -2810,47 +496,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished">Ladda ner från dykdator</translation>
+        <translation>Ladda ner från dykdator</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation>Leverantör</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Dykdator</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation>Enhet eller monteringspunkt</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished">Tvinga nedladdning av alla dyk</translation>
+        <translation>Tvinga nedladdning av alla dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation>Föredra alltid nedladdad dykinformation</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Avbryt</translation>
     </message>
 </context>
 <context>
@@ -2858,225 +544,225 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="14"/>
         <source>TabWidget</source>
-        <translation type="unfinished"></translation>
+        <translation>TabWidget</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
         <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
-        <translation type="unfinished">Dykanteckningar</translation>
+        <translation>Dykanteckningar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="66"/>
         <source>Starttime</source>
-        <translation type="unfinished"></translation>
+        <translation>Starttid</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="73"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"></translation>
+        <translation>luft / vattentemperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="112"/>
         <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
-        <translation type="unfinished">Plats</translation>
+        <translation>Plats</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation>Koordinater</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
-        <translation type="unfinished">Divemaster</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
-        <translation type="unfinished">Parkamrat</translation>
+        <translation>Parkamrat</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="119"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation>Taggar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
-        <translation type="unfinished">Rankning</translation>
+        <translation>Rankning</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
-        <translation type="unfinished">Synlighet</translation>
+        <translation>Synlighet</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
-        <translation type="unfinished">Dräkt</translation>
+        <translation>Dräkt</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="217"/>
         <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
-        <translation type="unfinished">Anteckningar</translation>
+        <translation>Anteckningar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
-        <translation type="unfinished">Utrustning</translation>
+        <translation>Utrustning</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
-        <translation type="unfinished">Information</translation>
+        <translation>Information</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation>Intervall</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Gasanvändning</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"></translation>
+        <translation>Gasanvändning</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="466"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Maxdjup</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Medeldjup</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Lufttryck</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Lufttemperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Vattentemperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
-        <translation type="unfinished">Dyktid</translation>
+        <translation>Dyktid</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
-        <translation type="unfinished"></translation>
+        <translation>Salthalt</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
-        <translation type="unfinished">Statistik</translation>
+        <translation>Statistik</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
-        <translation type="unfinished">Djup</translation>
+        <translation>Djup</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatur</translation>
+        <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
-        <translation type="unfinished">Varaktighet</translation>
+        <translation>Varaktighet</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation type="unfinished">Total tid</translation>
+        <translation>Total tid</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation type="unfinished">Dyk</translation>
+        <translation>Dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
-        <translation type="unfinished">Flaskor</translation>
+        <translation>Flaskor</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Lägg till flaska</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation>Vikter</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"></translation>
+        <translation>Lägg till Viktsystem</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="317"/>
         <source>Trip Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Resmål</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="296"/>
         <location filename="../qt-ui/maintab.cpp" line="319"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Resmålsanteckningar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="134"/>
         <location filename="../qt-ui/maintab.cpp" line="136"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation>Detta resmål håller på och ändras, välj Spara eller Avbryt när du är klar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="143"/>
         <location filename="../qt-ui/maintab.cpp" line="144"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation>Flera dyk håller på och ändras. Välj Spara eller Avbryt när du är klar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="146"/>
         <location filename="../qt-ui/maintab.cpp" line="147"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"></translation>
+        <translation>Detta dyk håller på och ändras. Välj Spara eller Avbryt när du är klar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="362"/>
@@ -3085,32 +771,32 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="400"/>
         <location filename="../qt-ui/maintab.cpp" line="401"/>
         <source>/min</source>
-        <translation type="unfinished"></translation>
+        <translation>/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="364"/>
         <source>unknown</source>
-        <translation type="unfinished">okänd</translation>
+        <translation>okänd</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
-        <translation type="unfinished">E</translation>
+        <translation>E</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
-        <translation type="unfinished">W</translation>
+        <translation>W</translation>
     </message>
 </context>
 <context>
@@ -3118,417 +804,377 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="obsolete">Fil</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Log</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Visa</translation>
+        <translation>Huvudfönster</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Hjälp</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;File</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="192"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Logg</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="203"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Visa</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="224"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hjälp</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="231"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Import</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ny Loggbok</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
-        <translation type="unfinished">Ny</translation>
+        <translation>Ny</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Öppna loggbok</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Öppna</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Spara</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Spara</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished">Spara som</translation>
+        <translation>Spara som</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
-        <translation type="unfinished">Stäng</translation>
+        <translation>Stäng</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Importera filer</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportera &amp;UDDF</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Skriv ut</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="333"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+,</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Avsluta</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Ladda ner från dykdator</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation>Importera &amp;GPSdata från Subsurface webbtjänst</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ändra Enhetsnamn</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl++</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Renumrering</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="391"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoom av/på</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Årsstatistik</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Dive List</source>
-        <translation type="unfinished"></translation>
+        <translation>Dyklista</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Profile</source>
-        <translation type="unfinished">Profil</translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Info</source>
-        <translation type="unfinished">Info</translation>
+        <translation>Info</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alla</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Användarmanual</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation>Glob</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation>Pl&amp;anera Dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CSV</source>
-        <translation type="unfinished"></translation>
+        <translation>Importera CSV</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"></translation>
+        <translation>Importera CS&amp;V</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="499"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation>Import från Divelogs.de</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Preferences</source>
-        <translation type="unfinished">Inställningar</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete">Avsluta</translation>
+        <translation>Inställningar</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Device Names</source>
-        <translation type="obsolete">Ändra Enhetsnamn</translation>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renumber</source>
-        <translation type="obsolete">Uppdatera numrering</translation>
+        <translation>Nytt dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
         <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Zoom</source>
-        <translation type="obsolete">Zoom av/på</translation>
-    </message>
-    <message>
-        <source>Yearly Statistics</source>
-        <translation type="obsolete">Årsstatistik</translation>
+        <translation>Autogruppering</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+2</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+3</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="423"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+4</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
-        <translation type="unfinished">Föregående dykdator</translation>
+        <translation>Föregående dykdator</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Vänster</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
-        <translation type="unfinished">Nästa dykdator</translation>
+        <translation>Nästa dykdator</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Höger</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
-        <translation type="unfinished">Välj händelser</translation>
+        <translation>Välj händelser</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
-        <translation type="unfinished">Skriv plan</translation>
+        <translation>Skriv plan</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Om Subsurface</translation>
-    </message>
-    <message>
-        <source>User Manual</source>
-        <translation type="obsolete">Användarmanual</translation>
+        <translation>Om Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation>F1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+5</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
-        <translation type="unfinished">Öppna fil</translation>
+        <translation>Öppna fil</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"></translation>
+        <translation>Kan inte hitta Subsurface manualen</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vill du spara ändringarna gjorda i filen %1?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vill du spara ändringarna gjorda i datafilen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished">Spara ändringar?</translation>
+        <translation>Spara ändringar?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ändringar förloras om du inte sparar dom.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"></translation>
+        <translation>Spara fil som</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -3538,17 +1184,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Varning</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
+        <translation>UDDF filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -3556,289 +1202,289 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardvärden</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
         <source>Units</source>
-        <translation type="unfinished">Enheter</translation>
+        <translation>Enheter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation>Graf</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation>Listor och tabeller</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Font</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation>Fontstorlek</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished">Dyk</translation>
+        <translation>Dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard dykfil</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>Display ogiltig</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardflaska</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Använd standardflaska</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation>System</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation>Metrisk</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"></translation>
+        <translation>Imperial</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"></translation>
+        <translation>Personifiera</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
-        <translation type="unfinished">Djup</translation>
+        <translation>Djup</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
-        <translation type="unfinished">meter</translation>
+        <translation>meter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished">fot</translation>
+        <translation>fot</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished">Tryck</translation>
+        <translation>Tryck</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"></translation>
+        <translation>Psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Volym</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished">liter</translation>
+        <translation>liter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
-        <translation type="unfinished">ft^3</translation>
+        <translation>ft^3</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished">Temperatur</translation>
+        <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
-        <translation type="unfinished">Celsius</translation>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished">Fahrenheit</translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Vikt</translation>
+        <translation>Vikt</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"></translation>
+        <translation>Kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
-        <translation type="unfinished">pund</translation>
+        <translation>pund</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidsenheter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>Minuter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Sekunder</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Visa</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"></translation>
+        <translation>pO2</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"></translation>
+        <translation>Tröskel</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"></translation>
+        <translation>pN2</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"></translation>
+        <translation>pHe</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"></translation>
+        <translation>MOD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
-        <translation type="unfinished"></translation>
+        <translation>max PP02</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"></translation>
+        <translation>EAD END EADD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation>Dykdator rapporterade tak</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation>Visa tak i rött</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation>Visa beräknad tak-information</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"></translation>
+        <translation>Visa alla vävnader</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"></translation>
+        <translation>Inkrement 3m</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"></translation>
+        <translation>Beräkna NDL/TTS</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="754"/>
         <source>Show SAC</source>
-        <translation type="unfinished"></translation>
+        <translation>Visa SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"></translation>
+        <translation>GFLow på maxdjup</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Blandat</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"></translation>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"></translation>
+        <translation>Välj standard loggfil</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -3846,7 +1492,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Skriv ut</translation>
     </message>
 </context>
 <context>
@@ -3854,37 +1500,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Dive#</source>
-        <translation type="unfinished">Dyknr</translation>
+        <translation>Dyknr</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Depth</source>
-        <translation type="unfinished">Djup</translation>
+        <translation>Djup</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished">Varaktighet</translation>
+        <translation>Varaktighet</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Master</source>
-        <translation type="unfinished">master</translation>
+        <translation>master</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Buddy</source>
-        <translation type="unfinished">Parkamrat</translation>
+        <translation>Parkamrat</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Location</source>
-        <translation type="unfinished">Plats</translation>
+        <translation>Plats</translation>
     </message>
 </context>
 <context>
@@ -3892,84 +1538,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Form</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="26"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation>Utskriftsoptioner</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="44"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished">Skriv ut valda dyk</translation>
+        <translation>Skriv ut valda dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="63"/>
         <source>Print in color</source>
-        <translation type="unfinished">Skriv ut i färg</translation>
+        <translation>Skriv ut i färg</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="89"/>
         <source>Print type</source>
-        <translation type="unfinished">Utskriftstyp</translation>
+        <translation>Utskriftstyp</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="119"/>
         <source>6 dives per page</source>
-        <translation type="unfinished">6 dyk per sida</translation>
+        <translation>6 dyk per sida</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="135"/>
         <source>2 dives per page</source>
-        <translation type="unfinished">2 dyk per sida</translation>
+        <translation>2 dyk per sida</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="148"/>
         <source>Table print</source>
-        <translation type="unfinished">Tabellutskrift</translation>
+        <translation>Tabellutskrift</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="165"/>
         <source>Ordering</source>
-        <translation type="unfinished">Sortering</translation>
+        <translation>Sortering</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="183"/>
         <source>Profile on top</source>
-        <translation type="unfinished">Profil ovanpå</translation>
+        <translation>Profil ovanpå</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="205"/>
         <source>Notes on top</source>
-        <translation type="unfinished">Anteckningar ovanpå</translation>
+        <translation>Anteckningar ovanpå</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="222"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation>Dimensionering av höjder (% av layout)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="259"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilhöjd (43% - 85%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="281"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Höjd på övriga uppgifter (8% - 17%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="341"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Anteckningar höjd (0% - 52%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="357"/>
         <location filename="../qt-ui/printoptions.ui" line="373"/>
         <location filename="../qt-ui/printoptions.ui" line="389"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation>0</translation>
     </message>
 </context>
 <context>
@@ -3977,87 +1623,87 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"></translation>
+        <translation>Göm händelser</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"></translation>
+        <translation>Göm alla %1händelser</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta bort markerad händelse</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 @ %2:%3</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"></translation>
+        <translation>Okänd dykdator</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>Sätt varaktighet: 10 minuter</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation>Skala</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"></translation>
+        <translation>Linjal</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"></translation>
+        <translation>Mätegenskaper på dyksegment</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"></translation>
+        <translation>Skala dyk till skärmstorlek</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
         <source>Edit</source>
-        <translation type="unfinished">Redigera</translation>
+        <translation>Redigera</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
-        <translation type="unfinished">luft</translation>
+        <translation>luft</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
-        <translation type="unfinished"></translation>
+        <translation>EAN%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
-        <translation type="unfinished">Bailout till öppet system</translation>
+        <translation>Bailout till öppet system</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">start</translation>
+        <translation>start</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
-        <translation type="unfinished">slut</translation>
+        <translation>slut</translation>
     </message>
 </context>
 <context>
@@ -4065,62 +1711,62 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished">okänd</translation>
+        <translation>okänd</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Dyk #%1 - %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Maxdjup: %1 %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"></translation>
+        <translation>Varaktighet: %1 min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
-        <translation type="unfinished">Flaska</translation>
+        <translation>Flaska</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
-        <translation type="unfinished">Gasblandning</translation>
+        <translation>Gasblandning</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
-        <translation type="unfinished">Gasanvändning</translation>
+        <translation>Gasanvändning</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
-        <translation type="unfinished">SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
-        <translation type="unfinished">Max. CNS</translation>
+        <translation>Max. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
-        <translation type="unfinished">OTU</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"></translation>
+        <translation>Vikter</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"></translation>
+        <translation>Total vikt</translation>
     </message>
 </context>
 <context>
@@ -4128,50 +1774,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
         <source>AIR</source>
-        <translation type="unfinished">LUFT</translation>
+        <translation>LUFT</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EAN32</source>
-        <translation type="obsolete">EAN32</translation>
-    </message>
-    <message>
-        <source>EAN36</source>
-        <translation type="obsolete">EAN36</translation>
+        <translation>Ta bort denna punkt</translation>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="235"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation>Inga platsuppgifter - flytta kartan och dubbelklicka för att ställa in dykplats</translation>
     </message>
     <message>
         <location filename="../qt-ui/globe.cpp" line="247"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"></translation>
+        <translation>Ändra dyk - Flytta runt kartan och dubbelklicka för att ställa in dykplats</translation>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation type="unfinished">Stäng</translation>
+        <translation>Stäng</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
-        <translation type="unfinished">Genomsnitt</translation>
+        <translation>Genomsnitt</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished">Minimum</translation>
+        <translation>Minimum</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
-        <translation type="unfinished">Maximum</translation>
+        <translation>Maximum</translation>
     </message>
 </context>
 <context>
@@ -4179,12 +1817,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="14"/>
         <source>Renumber</source>
-        <translation type="unfinished">Uppdatera numrering</translation>
+        <translation>Uppdatera numrering</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="26"/>
         <source>New starting number</source>
-        <translation type="unfinished">Nytt startnummer</translation>
+        <translation>Nytt startnummer</translation>
     </message>
 </context>
 <context>
@@ -4192,27 +1830,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation>Skifta valda tider</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation>Skifta tider på valda dyk med</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation>tidigare</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation>senare</translation>
     </message>
 </context>
 <context>
@@ -4220,27 +1858,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation type="unfinished">Om Subsurface</translation>
+        <translation>Om Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="64"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Textettikett</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;License</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hemsida</translation>
     </message>
 </context>
 <context>
@@ -4248,37 +1886,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
-        <translation type="unfinished">Webbtjänst</translation>
+        <translation>Webbtjänst</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vänta ett litet tag innan vi har något...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"></translation>
+        <translation>Nedladdning klar</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
-        <translation type="unfinished">Kontaktfel:</translation>
+        <translation>Kontaktfel:</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
-        <translation type="unfinished">Ogiltigt användarid!</translation>
+        <translation>Ogiltigt användarid!</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
-        <translation type="unfinished">Kan inte tolka respons</translation>
+        <translation>Kan inte tolka respons</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
-        <translation type="unfinished">Nedladdning lyckades!</translation>
+        <translation>Nedladdning lyckades!</translation>
     </message>
 </context>
 <context>
@@ -4286,30 +1924,30 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Form</translation>
     </message>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation>Lägg till flaska</translation>
     </message>
 </context>
 <context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished">bar</translation>
+        <source>Description</source>
+        <translation>Beskrivning</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
-        <translation type="unfinished"></translation>
+        <translation>Ml</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>Bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
@@ -4317,20 +1955,20 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Information</translation>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <source>Description</source>
+        <translation>Beskrivning</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
 </context>
 <context>
@@ -4338,37 +1976,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Ladda ner platsdata</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation>Status:</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv in ditt ID här</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Ladda ned</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Användarid</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
         <source>Password</source>
-        <translation type="unfinished">Lösenord</translation>
+        <translation>Lösenord</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation>Ladda upp</translation>
     </message>
 </context>
 <context>
@@ -4376,17 +2014,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
-        <translation type="unfinished">Vikt</translation>
+        <translation>Vikt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicka här för att ta bort detta viktsystem</translation>
     </message>
 </context>
 <context>
@@ -4395,42 +2033,45 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"></translation>
+        <translation>År
+&gt; Månad / Resmål</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"></translation>
+        <translation>Varaktighet
+Total</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Genomsnitt</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation>Kortaste</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"></translation>
+        <translation>Längsta</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Djup (%1)
+Medel</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -4438,7 +2079,8 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Minimum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -4446,19 +2088,22 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Maximum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>SAC (%1)
+Medel</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Temp. (%1)
+Medel</translation>
     </message>
 </context>
 <context>
@@ -4466,64 +2111,60 @@ Maximum</source>
     <message>
         <location filename="../dive.c" line="57"/>
         <source>pascal</source>
-        <translation type="unfinished">pascal</translation>
+        <translation>pascal</translation>
     </message>
     <message>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished">bar</translation>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished">psi</translation>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
         <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
-        <translation type="unfinished">l</translation>
+        <translation>l</translation>
     </message>
     <message>
         <location filename="../dive.c" line="106"/>
         <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
-        <translation type="unfinished">ft³</translation>
+        <translation>ft³</translation>
     </message>
     <message>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished">ft</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
         <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
-        <translation type="unfinished">pund</translation>
+        <translation>pund</translation>
     </message>
     <message>
         <location filename="../dive.c" line="187"/>
         <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
-        <translation type="unfinished">kg</translation>
+        <translation>kg</translation>
     </message>
     <message>
         <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
-        <translation type="unfinished">(%s) eller (%s)</translation>
-    </message>
-    <message>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="obsolete">%1$s, %3$d %2$s, %4$d %5$02d:%6$02d</translation>
+        <translation>(%s) eller (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="488"/>
@@ -4533,32 +2174,32 @@ Maximum</source>
         <location filename="../statistics.c" line="381"/>
         <location filename="../statistics.c" line="392"/>
         <source>air</source>
-        <translation type="unfinished">luft</translation>
+        <translation>luft</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="161"/>
         <source>integrated</source>
-        <translation type="unfinished">integrerat</translation>
+        <translation>integrerat</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="162"/>
         <source>belt</source>
-        <translation type="unfinished">bälte</translation>
+        <translation>bälte</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation type="unfinished">ankel</translation>
+        <translation>ankel</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
         <source>backplate weight</source>
-        <translation type="unfinished">Ryggplattans vikt</translation>
+        <translation>Ryggplattans vikt</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="165"/>
         <source>clip-on</source>
-        <translation type="unfinished">clip-on</translation>
+        <translation>clip-on</translation>
     </message>
     <message>
         <location filename="../file.c" line="107"/>
@@ -4568,314 +2209,306 @@ Maximum</source>
         <location filename="../file.c" line="390"/>
         <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished">Kunde inte öppna &apos;%s&apos;</translation>
+        <translation>Kunde inte öppna &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misslyckades att läsa %s&apos;. Använd Import av CSV filer</translation>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation>Maximalt antalet kolumner i CSV import är %d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
-        <translation type="unfinished">inget</translation>
+        <translation>inget</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
-        <translation type="unfinished">dekostopp</translation>
+        <translation>dekostopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
-        <translation type="unfinished">rbt</translation>
+        <translation>rbt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
-        <translation type="unfinished">uppstigning</translation>
+        <translation>uppstigning</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
-        <translation type="unfinished">ceiling</translation>
+        <translation>ceiling</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
-        <translation type="unfinished">arbetsbelastning</translation>
+        <translation>arbetsbelastning</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished">sändare</translation>
+        <translation>sändare</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
-        <translation type="unfinished">kränkning</translation>
+        <translation>kränkning</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
-        <translation type="unfinished">bokmärke</translation>
+        <translation>bokmärke</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished">ytan</translation>
+        <translation>ytan</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
-        <translation type="unfinished">säkerhetsstopp</translation>
+        <translation>säkerhetsstopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
-        <translation type="unfinished">gasbyte</translation>
+        <translation>gasbyte</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished">säkerhetsstopp (frivilligt)</translation>
+        <translation>säkerhetsstopp (frivilligt)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished">säkerhetsstopp (obligatoriskt)</translation>
+        <translation>säkerhetsstopp (obligatoriskt)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
-        <translation type="unfinished">djupstopp</translation>
+        <translation>djupstopp</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished">ceiling (säkerhetsstopp)</translation>
+        <translation>ceiling (säkerhetsstopp)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
-        <translation type="unfinished"></translation>
+        <translation>under golv</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
-        <translation type="unfinished">dyktid</translation>
+        <translation>dyktid</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
-        <translation type="unfinished">Maxdjup</translation>
+        <translation>Maxdjup</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
-        <translation type="unfinished">OLF</translation>
+        <translation>OLF</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished">PO2</translation>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
-        <translation type="unfinished">gastid</translation>
+        <translation>gastid</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
-        <translation type="unfinished">rgbm</translation>
+        <translation>rgbm</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
-        <translation type="unfinished">riktning</translation>
+        <translation>riktning</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
-        <translation type="unfinished">vävnadsnivå</translation>
+        <translation>vävnadsnivå</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
-        <translation type="unfinished">non stop tid</translation>
+        <translation>non stop tid</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
-        <translation type="unfinished">okänt händelsenummer</translation>
+        <translation>okänt händelsenummer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished">Kan inte skapa parser för %s %s</translation>
+        <translation>Kan inte skapa parser för %s %s</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
-        <translation type="unfinished">Kunde inte registrera parser-data</translation>
+        <translation>Kunde inte registrera parser-data</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished">Kunde inte tolka tid och datum</translation>
+        <translation>Kunde inte tolka tid och datum</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
-        <translation type="unfinished">Dyk #%d: %s %d %04d</translation>
+        <translation>Dyk #%d: %s %d %04d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished">Kunde inte tolka dyktid</translation>
+        <translation>Kunde inte tolka dyktid</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished">Kunde inte tolka maxdjup</translation>
+        <translation>Kunde inte tolka maxdjup</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
-        <translation type="unfinished">Kunde inte tolka antal gasblandningar</translation>
+        <translation>Kunde inte tolka antal gasblandningar</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished">Kunde inte ladda vattnets salthalt</translation>
+        <translation>Kunde inte ladda vattnets salthalt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation>Kunde inte få tag i tyck vid ytan</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
-        <translation type="unfinished">Kunde inte tolka gasblandning</translation>
+        <translation>Kunde inte tolka gasblandning</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished">Kunde inte tolka sampel</translation>
+        <translation>Kunde inte tolka sampel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation type="unfinished">Händelse: väntar på användaren</translation>
+        <translation>Händelse: väntar på användaren</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
+        <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished">Kunde inte registrera event-funktion</translation>
+        <translation>Kunde inte registrera event-funktion</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished">Kunde inte registrera avbrytningsrutin</translation>
+        <translation>Kunde inte registrera avbrytningsrutin</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
-        <translation type="unfinished">Lyckades inte importera dykdata</translation>
+        <translation>Lyckades inte importera dykdata</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation type="unfinished">Kan inte skapa libdivecomputer context</translation>
+        <translation>Kan inte skapa libdivecomputer context</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
-        <translation type="unfinished">Kunde inte öppna fil %s %s (%s)</translation>
+        <translation>Kunde inte öppna fil %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished">Konstig procent läsning %s
+        <translation>Konstig procent läsning %s
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1717"/>
-        <source>Failed to parse &apos;%s&apos;.
+        <source>Failed to parse '%s'.
 </source>
-        <translation type="unfinished">Kunde inte läsa &apos;%s&apos;.
+        <translation>Kunde inte läsa &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished">Kunde inte läsa &apos;%s&apos;</translation>
+        <translation>Kunde inte läsa &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
-        <translation type="unfinished">Databasfråga get_events misslyckades.
+        <translation>Databasfråga get_events misslyckades.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1951"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished">Databasanslutning misslyckades &apos;%s&apos;.
+        <translation>Databasanslutning misslyckades &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="1958"/>
-        <source>Database query failed &apos;%s&apos;.
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished">Databasfråga misslyckades &apos;%s&apos;.
+        <translation>Databasfråga misslyckades &apos;%s&apos;.
 </translation>
     </message>
     <message>
         <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
-        <translation type="unfinished">Kunde inte öppna stilmall (%s)%s</translation>
+        <translation>Kunde inte öppna stilmall (%s)%s</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
         <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
-        <translation type="unfinished">EAN%d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished">Kan inte hitta gasen %d/%d</translation>
-    </message>
-    <message>
-        <source>Cylinder for planning</source>
-        <translation type="obsolete">Flaska för planering</translation>
-    </message>
-    <message>
-        <source>Simulated Dive</source>
-        <translation type="obsolete">Simulerat dyk</translation>
+        <translation>Kan inte hitta gasen %d/%d</translation>
     </message>
     <message>
         <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished">För många gasblandningar</translation>
+        <translation>För många gasblandningar</translation>
     </message>
     <message>
         <location filename="../planner.c" line="493"/>
@@ -4884,7 +2517,7 @@ Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
 
 </source>
-        <translation type="unfinished">%s
+        <translation>%s
 Subsurface dykplan
 baserad på GFlow = %.0f och GFhigh = %.0f
 
@@ -4894,166 +2527,166 @@ baserad på GFlow = %.0f och GFhigh = %.0f
         <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Dyk till %.*f %s i %d:%02d min - totaltid %d:%02u on %s
+        <translation>Dyk till %.*f %s i %d:%02d min - totaltid %d:%02u on %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
-        <translation type="unfinished">Stanna vid %.*f %s för %d:%02d min - totaltid %d:%02u on %s
+        <translation>Stanna vid %.*f %s för %d:%02d min - totaltid %d:%02u on %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
-        <translation type="unfinished">Byt till gas %s
+        <translation>Byt till gas %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
-        <translation type="unfinished">Gasanvändning:
+        <translation>Gasanvändning:
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
-        <translation type="unfinished">%.0f%s av %s
+        <translation>%.0f%s av %s
 </translation>
     </message>
     <message>
         <location filename="../planner.c" line="776"/>
         <source>ean</source>
-        <translation type="unfinished">ean</translation>
-    </message>
-    <message>
-        <source>D:%.1f %s</source>
-        <translation type="obsolete">D:%.1f %s</translation>
+        <translation>ean</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 P:%d %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+V:%.2f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Beräknat tak %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Vävnad %.0fmin: %0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Såkerhetsstopp:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>@:%d:%02d
+D:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+SAC:%2.1fl/min</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Säkerhetsstopp:okänd tid @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 Deko:okänd tid @ %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
-        <translation type="unfinished">%s
+        <translation>%s
 i deko</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
-        <translation type="unfinished">%s
+        <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
-        <translation type="unfinished">%s
+        <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
-        <translation type="unfinished">%s
+        <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
@@ -5062,7 +2695,7 @@ MOD:%d%s</translation>
 EAD:%d%s
 END:%d%s
 EADD:%d%s</source>
-        <translation type="unfinished">%s
+        <translation>%s
 EAD:%d%s
 END:%d%s
 EADD:%d%s</translation>
@@ -5071,352 +2704,342 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+Deko:%umin @ %.0f %s (calc)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+i deko (calc)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+NDL:%umin (calc)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"></translation>
+        <translation>%s
+TTS:%umin (calc)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s %sD:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%s %sD:%.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation>%s %sP:%d %s</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation>C</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"></translation>
+        <translation>F</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
+        <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2, %3
+%4:%5</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2 (%3 dyk)</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>invalid</source>
-        <translation type="obsolete">ogiltig</translation>
+        <translation>%1 %2 (1 dyk)</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>boat</source>
-        <translation type="unfinished">båt</translation>
+        <translation>båt</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>shore</source>
-        <translation type="unfinished">strand</translation>
+        <translation>strand</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
         <source>drift</source>
-        <translation type="unfinished">ström</translation>
+        <translation>ström</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation type="unfinished">djup</translation>
+        <translation>djup</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>cavern</source>
-        <translation type="unfinished">cavern</translation>
+        <translation>cavern</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>ice</source>
-        <translation type="unfinished">is</translation>
+        <translation>is</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation type="unfinished">vrak</translation>
+        <translation>vrak</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation type="unfinished">grotta</translation>
+        <translation>grotta</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>altitude</source>
-        <translation type="unfinished">höjd</translation>
+        <translation>höjd</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>pool</source>
-        <translation type="unfinished">pool</translation>
+        <translation>pool</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>lake</source>
-        <translation type="unfinished">sjö</translation>
+        <translation>sjö</translation>
     </message>
     <message>
         <location filename="../dive.c" line="16"/>
         <source>river</source>
-        <translation type="unfinished">älv</translation>
+        <translation>älv</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>night</source>
-        <translation type="unfinished">natt</translation>
+        <translation>natt</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation>färsk</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>freshwater</source>
-        <translation type="obsolete">sötvatten</translation>
-    </message>
-    <message>
-        <source>training</source>
-        <translation type="obsolete">utbildning</translation>
-    </message>
-    <message>
-        <source>teaching</source>
-        <translation type="obsolete">undervisning</translation>
+        <translation>student</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>photo</source>
-        <translation type="unfinished">foto</translation>
+        <translation>foto</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>video</source>
-        <translation type="unfinished">video</translation>
+        <translation>video</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation>Instruktör</translation>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
         <source>deco</source>
-        <translation type="unfinished">deko</translation>
+        <translation>deko</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
-        <translation type="unfinished">mer än %d dagar</translation>
+        <translation>mer än %d dagar</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished">%dd %dt %dmin</translation>
+        <translation>%dd %dt %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished">%dt %dmin</translation>
+        <translation>%dt %dmin</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished">för dykningar #</translation>
+        <translation>för dykningar #</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
-        <translation type="unfinished">för utvalda dyk</translation>
+        <translation>för utvalda dyk</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
-        <translation type="unfinished">Dyk #%d </translation>
+        <translation>Dyk #%d </translation>
     </message>
     <message>
         <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
-        <translation type="unfinished">för valt dyk</translation>
+        <translation>för valt dyk</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
-        <translation type="unfinished">för alla dyk</translation>
+        <translation>för alla dyk</translation>
     </message>
     <message>
         <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
-        <translation type="unfinished">(inga dyk)</translation>
+        <translation>(inga dyk)</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
-        <translation type="unfinished">sön</translation>
+        <translation>sön</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
-        <translation type="unfinished">mån</translation>
+        <translation>mån</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
-        <translation type="unfinished">tis</translation>
+        <translation>tis</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
-        <translation type="unfinished">ons</translation>
+        <translation>ons</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
-        <translation type="unfinished">tor</translation>
+        <translation>tor</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
-        <translation type="unfinished">fre</translation>
+        <translation>fre</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
-        <translation type="unfinished">lör</translation>
+        <translation>lör</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
-        <translation type="unfinished">jan</translation>
+        <translation>jan</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
-        <translation type="unfinished">feb</translation>
+        <translation>feb</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
-        <translation type="unfinished">mar</translation>
+        <translation>mar</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
-        <translation type="unfinished">apr</translation>
+        <translation>apr</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
-        <translation type="unfinished">maj</translation>
+        <translation>maj</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
-        <translation type="unfinished">jun</translation>
+        <translation>jun</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
-        <translation type="unfinished">jul</translation>
+        <translation>jul</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
-        <translation type="unfinished">aug</translation>
+        <translation>aug</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
-        <translation type="unfinished">sep</translation>
+        <translation>sep</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
-        <translation type="unfinished">okt</translation>
+        <translation>okt</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
-        <translation type="unfinished">nov</translation>
+        <translation>nov</translation>
     </message>
     <message>
         <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
-        <translation type="unfinished">dec</translation>
+        <translation>dec</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="24"/>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished">Uemis Zurich: Filsystem är nästan fullt
+        <translation>Uemis Zurich: Filsystem är nästan fullt
 Återanslut dykdatorn och försök
 igen</translation>
     </message>
@@ -5425,7 +3048,7 @@ igen</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished">Uemis Zurich: Fullt filsystem
+        <translation>Uemis Zurich: Fullt filsystem
 Återanslut dykdatorn och försök
 igen</translation>
     </message>
@@ -5433,193 +3056,193 @@ igen</translation>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished">Kunde inte skriva filen req.txt
+        <translation>Kunde inte skriva filen req.txt
 Är Uemis Zurich ordentligt ansluten?</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished">okänd</translation>
+        <translation>okänd</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation type="unfinished">Läser %s %s</translation>
+        <translation>Läser %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
         <source>data</source>
-        <translation type="unfinished">data</translation>
+        <translation>data</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="398"/>
         <source>divelog entry id</source>
-        <translation type="unfinished">dyklog ID</translation>
+        <translation>dyklog ID</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="400"/>
         <source>divespot data id</source>
-        <translation type="unfinished">dykplats ID</translation>
+        <translation>dykplats ID</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="402"/>
         <source>more data dive id</source>
-        <translation type="unfinished">mer data dive id</translation>
+        <translation>mer data dive id</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>wetsuit</source>
-        <translation type="unfinished">våtdräkt</translation>
+        <translation>våtdräkt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>semidry</source>
-        <translation type="unfinished">semidry</translation>
+        <translation>semidry</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="582"/>
         <source>drysuit</source>
-        <translation type="unfinished">torrdräkt</translation>
+        <translation>torrdräkt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>shorty</source>
-        <translation type="unfinished">shorty</translation>
+        <translation>shorty</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>vest</source>
-        <translation type="unfinished">väst</translation>
+        <translation>väst</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>long john</source>
-        <translation type="unfinished">Longjohn</translation>
+        <translation>Longjohn</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>jacket</source>
-        <translation type="unfinished">jacka</translation>
+        <translation>jacka</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>full suit</source>
-        <translation type="unfinished">fulldräkt</translation>
+        <translation>fulldräkt</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="583"/>
         <source>2 pcs full suit</source>
-        <translation type="unfinished">2 pcs full suit</translation>
+        <translation>2 pcs full suit</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="584"/>
         <source>membrane</source>
-        <translation type="unfinished">membran</translation>
+        <translation>membran</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="761"/>
         <source>Init Communication</source>
-        <translation type="unfinished">Initierar anslutning</translation>
+        <translation>Initierar anslutning</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="763"/>
         <source>Uemis init failed</source>
-        <translation type="unfinished">Kunde inte läsa från Uemis</translation>
+        <translation>Kunde inte läsa från Uemis</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="774"/>
         <source>Start download</source>
-        <translation type="unfinished">Starta nedladdningen</translation>
+        <translation>Starta nedladdningen</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="194"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished">Säkerhetsstopp ej uppfyllt</translation>
+        <translation>Säkerhetsstopp ej uppfyllt</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished">Alarm: uppstigningshastighet</translation>
+        <translation>Alarm: uppstigningshastighet</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="199"/>
         <source>Speed Warning</source>
-        <translation type="unfinished">Varning: uppstigningshastighet</translation>
+        <translation>Varning: uppstigningshastighet</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation type="unfinished">Varning: grön PO2</translation>
+        <translation>Varning: grön PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation type="unfinished">Varning: uppstigning / PO2</translation>
+        <translation>Varning: uppstigning / PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished">Alarm: uppstigning / PO2</translation>
+        <translation>Alarm: uppstigning / PO2</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished">Info: flasktryck</translation>
+        <translation>Info: flasktryck</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>RGT Warning</source>
-        <translation type="unfinished">Varning: gastid</translation>
+        <translation>Varning: gastid</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Alert</source>
-        <translation type="unfinished">Varning: gastid</translation>
+        <translation>Varning: gastid</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished">Tankbyte rekommenderat</translation>
+        <translation>Tankbyte rekommenderat</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished">Maxdjup har överskridits</translation>
+        <translation>Maxdjup har överskridits</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished">Varning: max dekotid</translation>
+        <translation>Varning: max dekotid</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished">Dyktidsnot</translation>
+        <translation>Dyktidsnot</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished">Dyktidsvarning</translation>
+        <translation>Dyktidsvarning</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Marker</source>
-        <translation type="unfinished">markering</translation>
+        <translation>markering</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>No Tank Data</source>
-        <translation type="unfinished">Ingen flaskinformation</translation>
+        <translation>Ingen flaskinformation</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished">Batterivarning</translation>
+        <translation>Batterivarning</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished">Batterivarning</translation>
+        <translation>Batterivarning</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file