From 5ebcc2d237ec42545b6bf21003dafc10358aeb31 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Tue, 10 Dec 2013 21:26:02 +0100
Subject: Latest translation updates

Amazing progress. Bulgarian, Chinese (Taiwan), Slovak got completed - many
other translations added the hand full of new strings that showed up over
the last few days.

Thanks to all the translators.

I only pull these, authorship is tracked at Transifex.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 translations/subsurface_bg_BG.ts | 696 ++++++++++++++++++++-------------------
 translations/subsurface_de_CH.ts |  34 +-
 translations/subsurface_de_DE.ts |   2 +-
 translations/subsurface_es_ES.ts |   6 +-
 translations/subsurface_et_EE.ts | 115 +++----
 translations/subsurface_fr_FR.ts |  38 +--
 translations/subsurface_he.ts    | 102 +++---
 translations/subsurface_nl_NL.ts |   2 +-
 translations/subsurface_pl_PL.ts |   8 +-
 translations/subsurface_ru_RU.ts |   2 +-
 translations/subsurface_sk_SK.ts | 654 ++++++++++++++++++------------------
 translations/subsurface_sv_SE.ts |  24 +-
 translations/subsurface_zh_TW.ts | 175 +++++-----
 13 files changed, 955 insertions(+), 903 deletions(-)

diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index c2b8a2a90..4cf89fa84 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -4,12 +4,12 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"/>
+        <translation>Вмъкни файл (CSV)</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="129"/>
@@ -19,17 +19,17 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="197"/>
         <source>Field Separator</source>
-        <translation type="unfinished"/>
+        <translation>Разделител на полета</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"/>
+        <translation>Настройка на полета</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Import CSV file</source>
-        <translation type="unfinished"/>
+        <translation>Вмъкни CSV файл</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
@@ -49,27 +49,27 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="146"/>
         <source>Cns</source>
-        <translation type="unfinished"/>
+        <translation>Cns</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="163"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"/>
+        <translation>Дълбоч. стоп</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="215"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"/>
+        <translation>Пре-настроено вмъкване</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="71"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"/>
+        <translation>Отвори CSV регистър файл</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="71"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"/>
+        <translation>CSV файлове (*.csv)</translation>
     </message>
 </context>
 <context>
@@ -87,47 +87,47 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
-        <translation type="unfinished"/>
+        <translation>Раб.Налягане</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
-        <translation type="unfinished"/>
+        <translation>Старт.Налягане</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
-        <translation type="unfinished"/>
+        <translation>Стоп.Налягане</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
-        <translation type="unfinished"/>
+        <translation>Превключи при</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
-        <translation type="unfinished"/>
+        <translation>He%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>O</source>
-        <translation type="unfinished"/>
+        <translation>O</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="154"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"/>
+        <translation>Кликнете тук за да изтриете бутилка</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="376"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"/>
+        <translation>Бутилката не може да бъде премахната</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="377"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"/>
+        <translation>Този газ се използвза. Само бутилки, които не се използват в гмуркане могат да бъдат премахнати.</translation>
     </message>
 </context>
 <context>
@@ -135,18 +135,19 @@
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="14"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation>Редактирай прякори на гмуркачерски комютри</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>
     </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>
     </message>
 </context>
 <context>
@@ -159,7 +160,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="1233"/>
         <source>Device ID</source>
-        <translation type="unfinished"/>
+        <translation>Име на устройство</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1233"/>
@@ -169,7 +170,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="1255"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"/>
+        <translation>Кликнете тук за да изтриете гмуркачески компютър.</translation>
     </message>
 </context>
 <context>
@@ -177,12 +178,12 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> l/min</source>
-        <translation type="unfinished"/>
+        <translation>л/мин</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> cuft/min</source>
-        <translation type="unfinished"/>
+        <translation>кб.фута/мин</translation>
     </message>
 </context>
 <context>
@@ -190,97 +191,97 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="42"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"/>
+        <translation>Покажи Търсене</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>expand all</source>
-        <translation type="unfinished"/>
+        <translation>Разшири всички</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>collapse all</source>
-        <translation type="unfinished"/>
+        <translation>Свиване на всички</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>collapse others</source>
-        <translation type="unfinished"/>
+        <translation>Свиване на други</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"/>
+        <translation>Изтрий гмуркане (гмуркания) от пътуване</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>create new trip above</source>
-        <translation type="unfinished"/>
+        <translation>Създай ново пътуване отгоре</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>add dive(s) to trip immediately above</source>
-        <translation type="unfinished"/>
+        <translation>Добави гмуркане (гмуркания) веднага над пътуване</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"/>
+        <translation>Слей пътуване с горно пътуване</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"/>
+        <translation>Слей пътуване с долно пътуване</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"/>
+        <translation>Изтрий гмуркане (гмуркания)</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>mark dive(s) invalid</source>
-        <translation type="unfinished"/>
+        <translation>Маркирай гмуркания (гмуркане) като невалидни</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>save As</source>
-        <translation type="unfinished"/>
+        <translation>Запиши като</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"/>
+        <translation>Експорт като UDDF файл</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="728"/>
         <source>shift times</source>
-        <translation type="unfinished"/>
+        <translation>времена на изместване</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="731"/>
         <source>upload dive(s) to divelogs.de</source>
-        <translation type="unfinished"/>
+        <translation>Качи гмуркане (гмуркания) към Divelogs.de</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="757"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"/>
+        <translation>Запиши гмуркания като...</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="776"/>
         <source>Save File as</source>
-        <translation type="unfinished"/>
+        <translation>Запиши файла като</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"/>
+        <translation>UDDF файлове (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"/>
+        <translation>Слей избраните гмуркания</translation>
     </message>
 </context>
 <context>
@@ -288,37 +289,37 @@
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"/>
+        <translation>Долен SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"/>
+        <translation>SAC и DECO стоп</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
-        <translation type="unfinished"/>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
-        <translation type="unfinished"/>
+        <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="125"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"/>
+        <translation>Последен стоп на 6 метра</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
-        <translation type="unfinished"/>
+        <translation>Стартово време</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"/>
+        <translation>АТМ налягане</translation>
     </message>
 </context>
 <context>
@@ -326,23 +327,24 @@
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"/>
+        <translation>10м</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"/>
+        <translation>30фута</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="386"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"/>
+        <translation>Грешка при позицията на държача</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="387"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"/>
+        <translation>Един или повече от вашите стопове ще бъдат загубени
+при тази операция. Моля, първо ги премахнете.</translation>
     </message>
 </context>
 <context>
@@ -355,7 +357,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
         <source>Final Depth</source>
-        <translation type="unfinished"/>
+        <translation>Финална дълбочина</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
@@ -365,22 +367,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1101"/>
         <source>Used Gas</source>
-        <translation type="unfinished"/>
+        <translation>Използван газ</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1102"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"/>
+        <translation>CC Set Point</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1307"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"/>
+        <translation>Изтрий плана?</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1308"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"/>
+        <translation>Вие ще изтриете плана.</translation>
     </message>
 </context>
 <context>
@@ -388,17 +390,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="957"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"/>
+        <translation>Точки в гмуркачески плановик</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="960"/>
         <source>Available Gases</source>
-        <translation type="unfinished"/>
+        <translation>Достъпни газове</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="977"/>
         <source>add dive data point</source>
-        <translation type="unfinished"/>
+        <translation>Добави точка в гмуркането</translation>
     </message>
 </context>
 <context>
@@ -411,7 +413,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1138"/>
         <source>date</source>
-        <translation type="unfinished"/>
+        <translation>дата</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
@@ -441,17 +443,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1144"/>
         <source>suit</source>
-        <translation type="unfinished"/>
+        <translation>водолазен костюм</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>cyl</source>
-        <translation type="unfinished"/>
+        <translation>бут.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>location</source>
-        <translation type="unfinished"/>
+        <translation>местонахождение</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
@@ -474,94 +476,95 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/>
         <source>Invalid response from server</source>
-        <translation type="unfinished"/>
+        <translation>Грешен отговор от сървъра</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
-        <translation type="unfinished"/>
+        <translation>Очакван XML таг &apos;DiveDateReader&apos;, вместо това получен &apos;%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
-        <translation type="unfinished"/>
+        <translation>Очакван XML таг &apos;DiveDates&apos; не беше намерен</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/>
         <source>Malformed XML response. Line %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>Грешен XML отговор. Ред %1: %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/>
         <source>Cannot create DLD file</source>
-        <translation type="unfinished"/>
+        <translation>DLD файл не може да бъде създаден</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/>
         <source>Done</source>
-        <translation type="unfinished"/>
+        <translation>Готово</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/>
         <source>Uploading dive list...</source>
-        <translation type="unfinished"/>
+        <translation>Обновяване на списъка от гмуркания...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/>
         <source>Downloading dive list...</source>
-        <translation type="unfinished"/>
+        <translation>Изтегляне на списък от гмуркания...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/>
         <source>Downloading %1 dives...</source>
-        <translation type="unfinished"/>
+        <translation>Изтегляне на %1 гмуркания...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/>
         <source>Download finished - %1</source>
-        <translation type="unfinished"/>
+        <translation>Изтеглянето приключи - %1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/>
         <source>Corrupted download</source>
-        <translation type="unfinished"/>
+        <translation>Неправилно изтегляне</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/>
         <source>The archive could not be opened:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Архива не може да бъде отворен:
+%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
         <source>Upload failed</source>
-        <translation type="unfinished"/>
+        <translation>Грешка при качването</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/>
         <source>Upload successful</source>
-        <translation type="unfinished"/>
+        <translation>Успешно качване</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/>
         <source>Login failed</source>
-        <translation type="unfinished"/>
+        <translation>Грешка при логин</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/>
         <source>Cannot parse response</source>
-        <translation type="unfinished"/>
+        <translation>Не може да бъде направен разбор на отговора</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Грешка: %1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/>
         <source>Upload finished</source>
-        <translation type="unfinished"/>
+        <translation>Качването приключи</translation>
     </message>
 </context>
 <context>
@@ -570,7 +573,7 @@ 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>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
@@ -593,22 +596,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
         <source>Vendor</source>
-        <translation type="unfinished"/>
+        <translation>Производител</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="32"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"/>
+        <translation>Леководолазен компютър</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"/>
+        <translation>Устройсто или входна точка</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
@@ -618,17 +621,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"/>
+        <translation>Винаги предпочитай изтегленото гмуркане</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
         <source>OK</source>
-        <translation type="unfinished"/>
+        <translation>ОК</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Отмяна</translation>
     </message>
 </context>
 <context>
@@ -636,7 +639,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/globe.cpp" line="104"/>
         <source>Edit Selected Dive Locations</source>
-        <translation type="unfinished"/>
+        <translation>Редактирай избраните местонахождения</translation>
     </message>
 </context>
 <context>
@@ -656,7 +659,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Coordinates</source>
-        <translation type="unfinished"/>
+        <translation>Координати</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="169"/>
@@ -671,22 +674,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Start time</source>
-        <translation type="unfinished"/>
+        <translation>Стартово време</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <source>Air temp</source>
-        <translation type="unfinished"/>
+        <translation>Темп. на въздух</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <source>Water temp</source>
-        <translation type="unfinished"/>
+        <translation>Темп. на водата</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Tags</source>
-        <translation type="unfinished"/>
+        <translation>Тагове</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="192"/>
@@ -727,17 +730,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
-        <translation type="unfinished"/>
+        <translation>Интервал</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
-        <translation type="unfinished"/>
+        <translation>Използвани газове</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"/>
+        <translation>Консумиран газ</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="463"/>
@@ -748,12 +751,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"/>
+        <translation>Макс. дълбочина</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"/>
+        <translation>Средна дълбочина</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="520"/>
@@ -763,17 +766,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"/>
+        <translation>Атмосф. налягане</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"/>
+        <translation>Темп. на въздуха</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"/>
+        <translation>Темп. на водата</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="596"/>
@@ -783,7 +786,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
-        <translation type="unfinished"/>
+        <translation>Соленост</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="652"/>
@@ -823,28 +826,28 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Добави бутилка</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
-        <translation type="unfinished"/>
+        <translation>Тежести</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"/>
+        <translation>Добави система за тежест</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
-        <translation type="unfinished"/>
+        <translation>Местонахождение на пътуване</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="386"/>
         <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"/>
+        <translation>Бележки за пътуване</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="37"/>
@@ -854,22 +857,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Отмяна</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="231"/>
         <source>This trip is being edited.</source>
-        <translation type="unfinished"/>
+        <translation>Това пътуване се редактира.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="237"/>
         <source>Multiple dives are being edited.</source>
-        <translation type="unfinished"/>
+        <translation>Редактира се повече от едно гмуркане.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="239"/>
         <source>This dive is being edited.</source>
-        <translation type="unfinished"/>
+        <translation>Това гмуркане се редактира.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="454"/>
@@ -878,7 +881,7 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="492"/>
         <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>/min</source>
-        <translation type="unfinished"/>
+        <translation>/м</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="456"/>
@@ -916,32 +919,32 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Файл</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Регистър</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Изглед</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Помощ</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Вмъкване</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Нов регистър</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
@@ -951,27 +954,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Отвори регистър</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
-        <translation type="unfinished"/>
+        <translation>Отвори</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Запиши</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
@@ -981,7 +984,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="278"/>
@@ -992,7 +995,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="289"/>
@@ -1003,99 +1006,99 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.cpp" line="171"/>
         <source>Import Files</source>
-        <translation type="unfinished"/>
+        <translation>Вмъкни файлове</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"/>
+        <translation>Експорт на &amp;UDDF...</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Напечатай</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+,</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Изход</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"/>
+        <translation>Изтегли от леководолазен &amp;компютър</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"/>
+        <translation>Вмъкни &amp;GPS данни от Subsurface Service</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="360"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Редактирай имена на устройства</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl++</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Преномерирай</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="381"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"/>
+        <translation>Превключване на &amp;зуум</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"/>
+        <translation>Годишни &amp;статистики</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="402"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Dive List</source>
-        <translation type="unfinished"/>
+        <translation>Списък на гмуркания</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
@@ -1110,47 +1113,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>All</source>
-        <translation type="unfinished"/>
+        <translation>Всички</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"/>
+        <translation>Ръководство за &amp;потребителя</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Globe</source>
-        <translation type="unfinished"/>
+        <translation>Глобус</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Планирай гмуркане</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="492"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Import CSV</source>
-        <translation type="unfinished"/>
+        <translation>Вмъкни CSV файл</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="500"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"/>
+        <translation>Вмъкни CS&amp;V файл</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"/>
+        <translation>Вмъкни от Divelogs.de</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="327"/>
@@ -1160,42 +1163,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="352"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Add Dive</source>
-        <translation type="unfinished"/>
+        <translation>Добави гмуркане</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="389"/>
         <source>Auto Group</source>
-        <translation type="unfinished"/>
+        <translation>Автоматично групиране</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="410"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+2</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="418"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+3</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="426"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+4</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="434"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
@@ -1205,7 +1208,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="442"/>
         <source>Left</source>
-        <translation type="unfinished"/>
+        <translation>Ляво</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
@@ -1215,7 +1218,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="450"/>
         <source>Right</source>
-        <translation type="unfinished"/>
+        <translation>Дясно</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="455"/>
@@ -1235,12 +1238,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="476"/>
         <source>F1</source>
-        <translation type="unfinished"/>
+        <translation>F1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="484"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+5</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="113"/>
@@ -1251,17 +1254,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="148"/>
         <location filename="../qt-ui/mainwindow.cpp" line="254"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
-        <translation type="unfinished"/>
+        <translation>Моля затворете текущата редакция на гмуркане преди да затворите файла.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="227"/>
         <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation type="unfinished"/>
+        <translation>Моля запишете или отменете текущата редакция на гмуркане преди да отворите плановика.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="290"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
-        <translation type="unfinished"/>
+        <translation>Моля запишете или отменете текущата редакция на гмуркане преди да добавите гмуркане.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="502"/>
@@ -1271,17 +1274,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="506"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"/>
+        <translation>Начъчника на Subsurface не може да бъде намерен</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="543"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"/>
+        <translation>Желаете ли да запишете промените във файла %1?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="545"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"/>
+        <translation>Желаете ли да запишете промените във файла с данни?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="550"/>
@@ -1291,18 +1294,18 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="551"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"/>
+        <translation>Промените ще бъдат изгубени ако не ги запишете.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="867"/>
         <source>First finish the current edition before trying to do another.</source>
-        <translation type="unfinished"/>
+        <translation>Моля, първо приключете с текущата редакция на гмуркане.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="200"/>
         <location filename="../qt-ui/mainwindow.cpp" line="745"/>
         <source>Save File as</source>
-        <translation type="unfinished"/>
+        <translation>Запиши файла като</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
@@ -1312,22 +1315,22 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="290"/>
         <location filename="../qt-ui/mainwindow.cpp" line="867"/>
         <source>Warning</source>
-        <translation type="unfinished"/>
+        <translation>Предупреждение</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation type="unfinished"/>
+        <translation>Моля запишете или отменете текущата редакция на гмуркане преди да отворите нов файл.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="201"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"/>
+        <translation>UDDF файлове (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="746"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -1335,7 +1338,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
         <source>Defaults</source>
-        <translation type="unfinished"/>
+        <translation>По подразбиране</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="95"/>
@@ -1345,27 +1348,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="105"/>
         <source>Graph</source>
-        <translation type="unfinished"/>
+        <translation>Диаграма</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="115"/>
         <source>Language</source>
-        <translation type="unfinished"/>
+        <translation>Език</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"/>
+        <translation>Списъци и таблици</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
-        <translation type="unfinished"/>
+        <translation>Шрифт</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
-        <translation type="unfinished"/>
+        <translation>Големина на шрифта</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="170"/>
@@ -1375,47 +1378,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="176"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"/>
+        <translation>Файл по подразбиране</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"/>
+        <translation>Невалиден дисплей</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Бутилка по подразбиране</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="220"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Използвай бутилка по подразбиране</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
-        <translation type="unfinished"/>
+        <translation>Състема</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
-        <translation type="unfinished"/>
+        <translation>Метрична</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
-        <translation type="unfinished"/>
+        <translation>Империална</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
-        <translation type="unfinished"/>
+        <translation>Настройки</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="307"/>
@@ -1425,12 +1428,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>meter</source>
-        <translation type="unfinished"/>
+        <translation>метър</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
         <source>feet</source>
-        <translation type="unfinished"/>
+        <translation>фута</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
@@ -1445,22 +1448,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>liter</source>
-        <translation type="unfinished"/>
+        <translation>литра</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
         <source>cu ft</source>
-        <translation type="unfinished"/>
+        <translation>кб. фут</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="395"/>
         <source>celsius</source>
-        <translation type="unfinished"/>
+        <translation>целзии</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="405"/>
         <source>fahrenheit</source>
-        <translation type="unfinished"/>
+        <translation>фаренхайт</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="422"/>
@@ -1470,17 +1473,17 @@ Please, remove them first.</source>
     <message utf8="true">
         <location filename="../qt-ui/preferences.ui" line="510"/>
         <source>pO₂</source>
-        <translation type="unfinished"/>
+        <translation>pO₂</translation>
     </message>
     <message utf8="true">
         <location filename="../qt-ui/preferences.ui" line="551"/>
         <source>pN₂</source>
-        <translation type="unfinished"/>
+        <translation>pN₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>System Default</source>
-        <translation type="unfinished"/>
+        <translation>По подразбиране на системата</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="857"/>
@@ -1495,7 +1498,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="361"/>
         <source>Volume</source>
-        <translation type="unfinished"/>
+        <translation>Обем</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="388"/>
@@ -1515,94 +1518,94 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
-        <translation type="unfinished"/>
+        <translation>Единици за време</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"/>
+        <translation>Знаменател за скорост на изкачване/спускане</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
-        <translation type="unfinished"/>
+        <translation>Минути</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
-        <translation type="unfinished"/>
+        <translation>Секунди</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
-        <translation type="unfinished"/>
+        <translation>Покажи</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="533"/>
         <location filename="../qt-ui/preferences.ui" line="574"/>
         <location filename="../qt-ui/preferences.ui" line="615"/>
         <source>threshold</source>
-        <translation type="unfinished"/>
+        <translation>праг</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
-        <translation type="unfinished"/>
+        <translation>pHe</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
-        <translation type="unfinished"/>
+        <translation>MOD</translation>
     </message>
     <message utf8="true">
         <location filename="../qt-ui/preferences.ui" line="656"/>
         <source>max ppO₂</source>
-        <translation type="unfinished"/>
+        <translation>макс. ppO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"/>
+        <translation>EAD END EADD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="681"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"/>
+        <translation>Отчетен таван на гмуркачески компютър</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="704"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"/>
+        <translation>рисувай червен таван</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"/>
+        <translation>Калкулиран таван</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="738"/>
         <source>show all tissues</source>
-        <translation type="unfinished"/>
+        <translation>покажи всички тъкани</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
-        <translation type="unfinished"/>
+        <translation>увеличение през 3м</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="758"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"/>
+        <translation>Калкулирай NDL/TTS</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="821"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"/>
+        <translation>GFLow на макс. дълбочина</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
-        <translation type="unfinished"/>
+        <translation>Общи</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
@@ -1617,32 +1620,32 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
-        <translation type="unfinished"/>
+        <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
-        <translation type="unfinished"/>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="195"/>
         <source>Restart required</source>
-        <translation type="unfinished"/>
+        <translation>Нужен рестарт</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="196"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
-        <translation type="unfinished"/>
+        <translation>За да смените успешно език е необходим рестарт на Subsurface.</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="229"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"/>
+        <translation>Отвори файла по подразбиране</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="229"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -1650,22 +1653,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="39"/>
         <source>&amp;Preview</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Преглед</translation>
     </message>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="43"/>
         <source>P&amp;rint</source>
-        <translation type="unfinished"/>
+        <translation>Пе&amp;чатане</translation>
     </message>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="47"/>
         <source>&amp;Close</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Затвори</translation>
     </message>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
-        <translation type="unfinished"/>
+        <translation>Напечатай</translation>
     </message>
 </context>
 <context>
@@ -1711,7 +1714,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
-        <translation type="unfinished"/>
+        <translation>Настройки на принтиране</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="41"/>
@@ -1761,29 +1764,29 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"/>
+        <translation>Размер по височина (% от оформлението)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"/>
+        <translation>Височина на профила (43% - 85%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"/>
+        <translation>Височина на други данни (8% - 17%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"/>
+        <translation>Височина на бележките (0% - 52%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="354"/>
         <location filename="../qt-ui/printoptions.ui" line="370"/>
         <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
-        <translation type="unfinished"/>
+        <translation>0</translation>
     </message>
 </context>
 <context>
@@ -1791,73 +1794,73 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
-        <translation type="unfinished"/>
+        <translation>Добави промяна на газа</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
-        <translation type="unfinished"/>
+        <translation>Добави бележка</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
-        <translation type="unfinished"/>
+        <translation>Премахни събитие</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
-        <translation type="unfinished"/>
+        <translation>Премахни малки събития</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
-        <translation type="unfinished"/>
+        <translation>Скрий събития</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"/>
+        <translation>Скрий всички %1 събития?</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"/>
+        <translation>Премахни избраните събития?</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"/>
+        <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>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"/>
+        <translation>Задай времетраене: 10 минути</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="511"/>
         <source>Scale</source>
-        <translation type="unfinished"/>
+        <translation>Скала</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
         <source>Ruler</source>
-        <translation type="unfinished"/>
+        <translation>Линия</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"/>
+        <translation>Измери свойства на гмуркачески сегменти</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"/>
+        <translation>Мащабиране на гмуркането по големината на екрана</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
@@ -1867,17 +1870,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="614"/>
         <source>pN</source>
-        <translation type="unfinished"/>
+        <translation>pN</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="640"/>
         <source>pHe</source>
-        <translation type="unfinished"/>
+        <translation>pHe</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="664"/>
         <source>pO</source>
-        <translation type="unfinished"/>
+        <translation>pO</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="752"/>
@@ -1889,7 +1892,7 @@ Please, remove them first.</source>
         <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>EAN%1</source>
-        <translation type="unfinished"/>
+        <translation>EAN%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1014"/>
@@ -1919,67 +1922,67 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1611"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"/>
+        <translation>Гмуркане №%1 - %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1614"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"/>
+        <translation>Макс. дълбочина: %1 %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1621"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"/>
+        <translation>Времетраене: %1 мин</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Gas Used:</source>
-        <translation type="unfinished"/>
+        <translation>Използван газ:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1628"/>
         <source>SAC:</source>
-        <translation type="unfinished"/>
+        <translation>SAC:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Max. CNS:</source>
-        <translation type="unfinished"/>
+        <translation>Макс. CNS</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1632"/>
         <source>Weights:</source>
-        <translation type="unfinished"/>
+        <translation>Тежести:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Notes:</source>
-        <translation type="unfinished"/>
+        <translation>Бележки:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Divemaster:</source>
-        <translation type="unfinished"/>
+        <translation>Водач:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Buddy:</source>
-        <translation type="unfinished"/>
+        <translation>Партньор:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>Suit:</source>
-        <translation type="unfinished"/>
+        <translation>Водолазен костюм:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1650"/>
         <source>Viz:</source>
-        <translation type="unfinished"/>
+        <translation>Видимост:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Rating:</source>
-        <translation type="unfinished"/>
+        <translation>Оценка:</translation>
     </message>
 </context>
 <context>
@@ -1992,7 +1995,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="736"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"/>
+        <translation>Изтрий тази точка</translation>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
@@ -2017,7 +2020,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/globe.cpp" line="242"/>
         <source>Move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
+        <translation>Кликнете два пъти на глобус картата за да дефинирате местонахождение на гмуркането.</translation>
     </message>
 </context>
 <context>
@@ -2038,27 +2041,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="20"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"/>
+        <translation>Измести избраните времена</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="37"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"/>
+        <translation>Измести времената в избраните гмуркания с</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="73"/>
         <source>h:mm</source>
-        <translation type="unfinished"/>
+        <translation>ч:мм</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="83"/>
         <source>earlier</source>
-        <translation type="unfinished"/>
+        <translation>по-рано</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>later</source>
-        <translation type="unfinished"/>
+        <translation>по-късно</translation>
     </message>
 </context>
 <context>
@@ -2071,17 +2074,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.cpp" line="19"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Мутли-платформен гмуркачески регистър софтуер&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Линус Торвалдс, Дирк Хондел, и други, 2011, 2012, 2013&lt;/span&gt;</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;License</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Лиценз</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="24"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Уебсайт</translation>
     </message>
 </context>
 <context>
@@ -2099,12 +2102,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
         <source>Download finished</source>
-        <translation type="unfinished"/>
+        <translation>Изтеглянето приключи</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/>
         <source>Download error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Грешка при изтеглянето: %1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/>
@@ -2132,7 +2135,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Добави бутилка</translation>
     </message>
 </context>
 <context>
@@ -2140,12 +2143,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="759"/>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Описание</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="759"/>
         <source>ml</source>
-        <translation type="unfinished"/>
+        <translation>мл.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="759"/>
@@ -2158,7 +2161,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1548"/>
         <source>Information</source>
-        <translation type="unfinished"/>
+        <translation>Информация</translation>
     </message>
 </context>
 <context>
@@ -2166,7 +2169,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="631"/>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Описание</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="631"/>
@@ -2179,22 +2182,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>Връзка към уеб услуга</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
         <source>Status:</source>
-        <translation type="unfinished"/>
+        <translation>Статус:</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="32"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"/>
+        <translation>Въведете вашия ID тук</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="39"/>
         <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Изтегли</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="63"/>
@@ -2209,17 +2212,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Качи</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/>
         <source>Operation timed out</source>
-        <translation type="unfinished"/>
+        <translation>Времето за операцията изтече</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/>
         <source>Transfering data...</source>
-        <translation type="unfinished"/>
+        <translation>Трансфер на данни...</translation>
     </message>
 </context>
 <context>
@@ -2237,7 +2240,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="451"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"/>
+        <translation>Кликнете тук за да изтриете система за тежест.</translation>
     </message>
 </context>
 <context>
@@ -2246,7 +2249,8 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1409"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"/>
+        <translation>Година
+ &gt; Месец / Пътуване</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1410"/>
@@ -2257,31 +2261,36 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"/>
+        <translation>Продължителност
+Общо</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>
 Average</source>
-        <translation type="unfinished"/>
+        <translation>
+Средно</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"/>
+        <translation>
+Най-късо</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Longest</source>
-        <translation type="unfinished"/>
+        <translation>
+Най-дълго</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"/>
+        <translation>Дълбочина (%1)
+Средно</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
@@ -2289,7 +2298,8 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"/>
+        <translation>
+Минимум</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
@@ -2297,19 +2307,22 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"/>
+        <translation>
+Максимум</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"/>
+        <translation>SAC (%1)
+Средно</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"/>
+        <translation>Темп. (%1)
+Средно</translation>
     </message>
 </context>
 <context>
@@ -2425,13 +2438,13 @@ Maximum</source>
         <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>Не може да се прочете &apos;%s&apos;. Използвайте вмъкване на CSV файлове.</translation>
     </message>
     <message>
         <location filename="../file.c" line="351"/>
         <location filename="../file.c" line="353"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"/>
+        <translation>Максималният потдържан брой на CSV колони е %d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
@@ -2523,7 +2536,7 @@ Maximum</source>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
-        <translation type="unfinished"/>
+        <translation>под</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
@@ -2613,7 +2626,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"/>
+        <translation>Грешка при прием на повърхностно налягане</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
@@ -2792,7 +2805,8 @@ T:%.1f %s</translation>
         <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"/>
+        <translation>%s
+V:%.2f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1302"/>
@@ -2805,7 +2819,8 @@ Calculated ceiling %.0f %s</source>
         <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"/>
+        <translation>%s
+Тъкан %.0fмин: %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1256"/>
@@ -2818,13 +2833,15 @@ Safetystop:%umin @ %.0f %s</source>
         <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"/>
+        <translation>@:%d:%02d
+D:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"/>
+        <translation>%s
+SAC:%2.1fl/min</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1259"/>
@@ -2911,90 +2928,95 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+Deco:%uмин @ %.0f %s (калк.)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"/>
+        <translation>В deco (калк.)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+NDL:%uмин (калк.)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+TTS:%uмин (калк,)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"/>
+        <translation>%sT: %d:%02d мин</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1410"/>
         <location filename="../profile.c" line="1414"/>
         <location filename="../profile.c" line="1418"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"/>
+        <translation>%s %sD:%.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1430"/>
         <location filename="../profile.c" line="1434"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sP:%d %s</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
-        <translation type="unfinished"/>
+        <translation>C</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
-        <translation type="unfinished"/>
+        <translation>F</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="469"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"/>
+        <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="482"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"/>
+        <translation>%1 %2, %3
+%4:%5</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"/>
+        <translation>%1 %2 (%3 гмуркания)</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"/>
+        <translation>%1 %2 (1 гмуркане)</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
@@ -3064,12 +3086,12 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"/>
+        <translation>нов</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"/>
+        <translation>студент</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
@@ -3084,7 +3106,7 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"/>
+        <translation>инструктор</translation>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts
index 781ad1626..14ae00fe2 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -112,7 +112,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>O</source>
-        <translation type="unfinished"/>
+        <translation>O</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="154"/>
@@ -495,13 +495,13 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/>
         <source>Cannot create DLD file</source>
-        <translation type="unfinished"/>
+        <translation>Kann DLD Datei nicht erzeugen</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/>
         <source>Done</source>
-        <translation type="unfinished"/>
+        <translation>Fertig</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/>
@@ -557,7 +557,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Fehler: %1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/>
@@ -1351,7 +1351,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="115"/>
         <source>Language</source>
-        <translation type="unfinished"/>
+        <translation>Sprache</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="141"/>
@@ -1426,12 +1426,12 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>meter</source>
-        <translation type="unfinished"/>
+        <translation>Meter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
         <source>feet</source>
-        <translation type="unfinished"/>
+        <translation>Fuss</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
@@ -1446,7 +1446,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>liter</source>
-        <translation type="unfinished"/>
+        <translation>Liter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
@@ -1456,12 +1456,12 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="395"/>
         <source>celsius</source>
-        <translation type="unfinished"/>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="405"/>
         <source>fahrenheit</source>
-        <translation type="unfinished"/>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="422"/>
@@ -1471,17 +1471,17 @@ Bitte entferne diese zuerst.</translation>
     <message utf8="true">
         <location filename="../qt-ui/preferences.ui" line="510"/>
         <source>pO₂</source>
-        <translation type="unfinished"/>
+        <translation>pO₂</translation>
     </message>
     <message utf8="true">
         <location filename="../qt-ui/preferences.ui" line="551"/>
         <source>pN₂</source>
-        <translation type="unfinished"/>
+        <translation>pN₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>System Default</source>
-        <translation type="unfinished"/>
+        <translation>Systemeinstellung</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="857"/>
@@ -1558,7 +1558,7 @@ Bitte entferne diese zuerst.</translation>
     <message utf8="true">
         <location filename="../qt-ui/preferences.ui" line="656"/>
         <source>max ppO₂</source>
-        <translation type="unfinished"/>
+        <translation>max. ppO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="672"/>
@@ -1868,7 +1868,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="614"/>
         <source>pN</source>
-        <translation type="unfinished"/>
+        <translation>pN</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="640"/>
@@ -1878,7 +1878,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="664"/>
         <source>pO</source>
-        <translation type="unfinished"/>
+        <translation>pO</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="752"/>
@@ -2180,7 +2180,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>Verbindung mit Webservice</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index e1dbdc704..15391503d 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -2181,7 +2181,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>Verbindung mit Webservice</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts
index 743c4f66e..c13c46c90 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -1565,7 +1565,7 @@ Por favor, bórralas antes.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
-        <translation>PEA PEN EADD</translation>
+        <translation>PEA PNE EADD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="681"/>
@@ -2182,7 +2182,7 @@ Por favor, bórralas antes.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>Conexión al servicio web</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
@@ -2921,7 +2921,7 @@ END:%d%s
 EADD:%d%s</source>
         <translation>%s
 PEA:%d%s
-PEN:%d%s
+PNE:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index 051d14fc8..77dbc2354 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -241,7 +241,7 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>mark dive(s) invalid</source>
-        <translation type="unfinished"/>
+        <translation>Märgista sukeldumine/sukeldumised ebaõnnestunuks</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="726"/>
@@ -261,12 +261,12 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="731"/>
         <source>upload dive(s) to divelogs.de</source>
-        <translation type="unfinished"/>
+        <translation>lae sukeldumised divelogs.de</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="757"/>
         <source>Save Dives As...</source>
-        <translation>Salvesta sukeldumised nimega</translation>
+        <translation>Salvesta sukeldumised nimega...</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="776"/>
@@ -491,79 +491,80 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/>
         <source>Malformed XML response. Line %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>Vigane XML vastus. Rida %1: %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/>
         <source>Cannot create DLD file</source>
-        <translation type="unfinished"/>
+        <translation>Ei suuda luua DLD faili</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/>
         <source>Done</source>
-        <translation type="unfinished"/>
+        <translation>Valmis</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/>
         <source>Uploading dive list...</source>
-        <translation type="unfinished"/>
+        <translation>Sukeldumiste listi üleslaadimine...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/>
         <source>Downloading dive list...</source>
-        <translation type="unfinished"/>
+        <translation>Sukeldumiste listi allalaadimine...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/>
         <source>Downloading %1 dives...</source>
-        <translation type="unfinished"/>
+        <translation>Laen alla %1 sukeldumist...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/>
         <source>Download finished - %1</source>
-        <translation type="unfinished"/>
+        <translation>Allalaadimine lõppenud - %1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/>
         <source>Corrupted download</source>
-        <translation type="unfinished"/>
+        <translation>Vigane allalaadimine</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/>
         <source>The archive could not be opened:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Arhiivi ei saa avada:
+%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
         <source>Upload failed</source>
-        <translation type="unfinished"/>
+        <translation>Üleslaadimine ebaõnnestus</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/>
         <source>Upload successful</source>
-        <translation type="unfinished"/>
+        <translation>Üleslaadimine edukas</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/>
         <source>Login failed</source>
-        <translation type="unfinished"/>
+        <translation>Sisselogimine ebaõnnestus</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/>
         <source>Cannot parse response</source>
-        <translation type="unfinished"/>
+        <translation>Ei suuda vastust tuvastada</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Viga: %1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/>
         <source>Upload finished</source>
-        <translation type="unfinished"/>
+        <translation>Üleslaadimine lõppenud</translation>
     </message>
 </context>
 <context>
@@ -590,7 +591,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation>Lae kompuutrist</translation>
+        <translation>Lae sukeldumiskompuutrist</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
@@ -729,12 +730,12 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
-        <translation>Intervall</translation>
+        <translation>Pinnaintervall</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
-        <translation>Kasutatud gaasid</translation>
+        <translation>Kasutatud gaas(id)</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="444"/>
@@ -760,7 +761,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
-        <translation>Hapnikumürgistuse ühik (OTU)</translation>
+        <translation>OTU</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="539"/>
@@ -780,7 +781,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
-        <translation>Sukeldumise aeg</translation>
+        <translation>Sukeldumise koguaeg</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="615"/>
@@ -810,12 +811,12 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
-        <translation>Koguaeg</translation>
+        <translation>Aeg kokku</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
-        <translation>Sukeldumised</translation>
+        <translation>Sukeldumisi kokku</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="73"/>
@@ -1362,12 +1363,12 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
-        <translation>Kirjatüüp</translation>
+        <translation>Font</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
-        <translation>Kirjatüübi suurus</translation>
+        <translation>Fondi suurus</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="170"/>
@@ -1412,7 +1413,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
-        <translation>Briti</translation>
+        <translation>Briti/Ameerika</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="283"/>
@@ -1472,17 +1473,17 @@ palun eemalda need esmalt.</translation>
     <message utf8="true">
         <location filename="../qt-ui/preferences.ui" line="510"/>
         <source>pO₂</source>
-        <translation type="unfinished"/>
+        <translation>pO₂</translation>
     </message>
     <message utf8="true">
         <location filename="../qt-ui/preferences.ui" line="551"/>
         <source>pN₂</source>
-        <translation type="unfinished"/>
+        <translation>pN₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>System Default</source>
-        <translation type="unfinished"/>
+        <translation>Süsteemi vaikeväärtus</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="857"/>
@@ -1517,7 +1518,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
-        <translation>Aja ühikud</translation>
+        <translation>Ajaühikud</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="453"/>
@@ -1559,7 +1560,7 @@ palun eemalda need esmalt.</translation>
     <message utf8="true">
         <location filename="../qt-ui/preferences.ui" line="656"/>
         <source>max ppO₂</source>
-        <translation type="unfinished"/>
+        <translation>max ppO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="672"/>
@@ -1629,12 +1630,12 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="195"/>
         <source>Restart required</source>
-        <translation type="unfinished"/>
+        <translation>Nõutav taaskäivitus</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="196"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
-        <translation type="unfinished"/>
+        <translation>Uue keele kasutuselevõtuks tuleb Subsurface taaskäivitada.</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="229"/>
@@ -1748,7 +1749,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
-        <translation>Tellimus</translation>
+        <translation>Järjestus</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="180"/>
@@ -1778,7 +1779,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
-        <translation>Märkuste osa suurus (0% - 52%)</translation>
+        <translation>Märkmete osa suurus (0% - 52%)</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="354"/>
@@ -1869,7 +1870,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="614"/>
         <source>pN</source>
-        <translation type="unfinished"/>
+        <translation>pN</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="640"/>
@@ -1879,7 +1880,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="664"/>
         <source>pO</source>
-        <translation type="unfinished"/>
+        <translation>pO</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="752"/>
@@ -2019,7 +2020,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/globe.cpp" line="242"/>
         <source>Move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
+        <translation>Liigu kaardil soovitud kohta ja märgi topeltklikiga sukeldumiskoht</translation>
     </message>
 </context>
 <context>
@@ -2068,7 +2069,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
         <source>About Subsurface</source>
-        <translation>Subsurface kohta</translation>
+        <translation>Programmist</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="19"/>
@@ -2101,12 +2102,12 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
         <source>Download finished</source>
-        <translation type="unfinished"/>
+        <translation>Allalaadimine lõppenud</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/>
         <source>Download error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Allalaadimise viga: %1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/>
@@ -2181,7 +2182,7 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>Veebiteenuse ühendus</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
@@ -2216,12 +2217,12 @@ palun eemalda need esmalt.</translation>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/>
         <source>Operation timed out</source>
-        <translation type="unfinished"/>
+        <translation>Toiming aegus</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/>
         <source>Transfering data...</source>
-        <translation type="unfinished"/>
+        <translation>Andmete ülekanne...</translation>
     </message>
 </context>
 <context>
@@ -2411,7 +2412,7 @@ Maksimum</translation>
     <message>
         <location filename="../equipment.c" line="163"/>
         <source>ankle</source>
-        <translation>hüppeliiges</translation>
+        <translation>pahkluu</translation>
     </message>
     <message>
         <location filename="../equipment.c" line="164"/>
@@ -2640,12 +2641,12 @@ Maksimum</translation>
     <message>
         <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
-        <translation>Sündmus: ootan kasutaja tegevust</translation>
+        <translation>Sündmus: ootan kasutaja sekkumist</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation>mudel=%u (0x%08x), püsivara=%u (0x%08x), seeranr=%u (0x%08x)</translation>
+        <translation>mudel=%u (0x%08x), püsivara=%u (0x%08x), seerianr=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
@@ -2867,7 +2868,8 @@ Deko:teadmata aeg @ %.0f %s</translation>
         <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
-        <translation>%s⏎ Decos</translation>
+        <translation>%s
+Dekos</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1276"/>
@@ -2887,7 +2889,8 @@ CNS:%u%%</translation>
         <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
-        <translation>%s⏎ pO%s:%.2fbar</translation>
+        <translation>%s
+pO%s:%.2fbar</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1232"/>
@@ -3032,7 +3035,7 @@ TTS:%umin (calc)</translation>
     <message>
         <location filename="../dive.c" line="14"/>
         <source>deep</source>
-        <translation>süva</translation>
+        <translation>sügav</translation>
     </message>
     <message>
         <location filename="../dive.c" line="14"/>
@@ -3047,12 +3050,12 @@ TTS:%umin (calc)</translation>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>wreck</source>
-        <translation>vraki</translation>
+        <translation>vrakk</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
         <source>cave</source>
-        <translation>koopa</translation>
+        <translation>koobas</translation>
     </message>
     <message>
         <location filename="../dive.c" line="15"/>
@@ -3431,12 +3434,12 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Dive Time Info</source>
-        <translation>Sukeldumise aja info</translation>
+        <translation>Sukeldumise kestuse info</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Alert</source>
-        <translation>Sukeldumise aja hoiatus</translation>
+        <translation>Sukeldumise kestuse hoiatus</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index 7faeb6403..3f0f016de 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -112,7 +112,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>O</source>
-        <translation type="unfinished"/>
+        <translation>O</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="154"/>
@@ -241,7 +241,7 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>mark dive(s) invalid</source>
-        <translation type="unfinished"/>
+        <translation>marquer la/les plongée(s) comme invalides</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="726"/>
@@ -261,7 +261,7 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="731"/>
         <source>upload dive(s) to divelogs.de</source>
-        <translation type="unfinished"/>
+        <translation>Télécharger la/les plongée(s) vers divelogs.de</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="757"/>
@@ -496,13 +496,13 @@ Veuillez d&apos;abord les supprimer.</translation>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/>
         <source>Cannot create DLD file</source>
-        <translation type="unfinished"/>
+        <translation>Impossible de créer le fichier DLD</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/>
         <source>Done</source>
-        <translation type="unfinished"/>
+        <translation>Terminé</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/>
@@ -539,27 +539,27 @@ Veuillez d&apos;abord les supprimer.</translation>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
         <source>Upload failed</source>
-        <translation type="unfinished"/>
+        <translation>Echec du téléchargement</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/>
         <source>Upload successful</source>
-        <translation type="unfinished"/>
+        <translation>Téléchargement terminé avec succès</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/>
         <source>Login failed</source>
-        <translation type="unfinished"/>
+        <translation>Echec de connexion</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/>
         <source>Cannot parse response</source>
-        <translation type="unfinished"/>
+        <translation>Impossible d&apos;analyser la réponse</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Erreur: %1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/>
@@ -1483,7 +1483,7 @@ Veuillez d&apos;abord les supprimer.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>System Default</source>
-        <translation type="unfinished"/>
+        <translation>Paramètre par défaut</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="857"/>
@@ -1635,7 +1635,7 @@ Veuillez d&apos;abord les supprimer.</translation>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="196"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
-        <translation type="unfinished"/>
+        <translation>Vous devez redémarrer Subsurface pour prendre en compte la nouvelle langue.</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="229"/>
@@ -1653,17 +1653,17 @@ Veuillez d&apos;abord les supprimer.</translation>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="39"/>
         <source>&amp;Preview</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Prévisualisation</translation>
     </message>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="43"/>
         <source>P&amp;rint</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Impression</translation>
     </message>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="47"/>
         <source>&amp;Close</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Fermer</translation>
     </message>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="61"/>
@@ -1870,7 +1870,7 @@ Veuillez d&apos;abord les supprimer.</translation>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="614"/>
         <source>pN</source>
-        <translation type="unfinished"/>
+        <translation>pN</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="640"/>
@@ -1880,7 +1880,7 @@ Veuillez d&apos;abord les supprimer.</translation>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="664"/>
         <source>pO</source>
-        <translation type="unfinished"/>
+        <translation>pO</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="752"/>
@@ -2182,7 +2182,7 @@ Veuillez d&apos;abord les supprimer.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>Connexion au Webservice</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
@@ -2217,7 +2217,7 @@ Veuillez d&apos;abord les supprimer.</translation>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/>
         <source>Operation timed out</source>
-        <translation type="unfinished"/>
+        <translation>Temps de réponse dépassé pour l&apos;opération</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/>
diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts
index e29f19328..807aab4c2 100644
--- a/translations/subsurface_he.ts
+++ b/translations/subsurface_he.ts
@@ -240,7 +240,7 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>mark dive(s) invalid</source>
-        <translation type="unfinished"/>
+        <translation>לא להתחשב בצלילות</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="726"/>
@@ -260,7 +260,7 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="731"/>
         <source>upload dive(s) to divelogs.de</source>
-        <translation type="unfinished"/>
+        <translation>העלה צלילות לאתר divelogs.de</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="757"/>
@@ -288,7 +288,7 @@
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"/>
+        <translation>צריכת גז בעומק מירבי</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="85"/>
@@ -495,13 +495,13 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/>
         <source>Cannot create DLD file</source>
-        <translation type="unfinished"/>
+        <translation>שגיאה ביצירת קובץ DLD</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/>
         <source>Done</source>
-        <translation type="unfinished"/>
+        <translation>סיים</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/>
@@ -537,27 +537,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
         <source>Upload failed</source>
-        <translation type="unfinished"/>
+        <translation>ההעלאה נכשלה</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/>
         <source>Upload successful</source>
-        <translation type="unfinished"/>
+        <translation>ההעלאה הסתיימה בהצלחה</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/>
         <source>Login failed</source>
-        <translation type="unfinished"/>
+        <translation>שגיאת התחברות (הזדהות)</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/>
         <source>Cannot parse response</source>
-        <translation type="unfinished"/>
+        <translation>תשובה לא ברורה</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Error: %1</source>
-        <translation type="unfinished"/>
+        <translation>שגיאה: %1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/>
@@ -839,13 +839,13 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
-        <translation type="unfinished"/>
+        <translation>מיקום</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="386"/>
         <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"/>
+        <translation>הערות</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="37"/>
@@ -884,17 +884,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
-        <translation type="unfinished"/>
+        <translation>לא ידוע</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="960"/>
         <source>N</source>
-        <translation type="unfinished"/>
+        <translation>צ</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="960"/>
         <source>S</source>
-        <translation type="unfinished"/>
+        <translation>ד</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="961"/>
@@ -904,7 +904,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="961"/>
         <source>W</source>
-        <translation type="unfinished"/>
+        <translation>מע</translation>
     </message>
 </context>
 <context>
@@ -952,7 +952,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="256"/>
@@ -967,7 +967,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="267"/>
@@ -982,7 +982,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="278"/>
@@ -993,7 +993,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="289"/>
@@ -1004,7 +1004,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="300"/>
@@ -1016,7 +1016,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="311"/>
@@ -1151,7 +1151,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="327"/>
@@ -1161,12 +1161,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="352"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
@@ -1181,22 +1181,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="410"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+2</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="418"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+3</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="426"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+4</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="434"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
@@ -1236,12 +1236,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="476"/>
         <source>F1</source>
-        <translation type="unfinished"/>
+        <translation>F1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="484"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+5</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="113"/>
@@ -1568,22 +1568,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="681"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"/>
+        <translation>עומק מקסימלי שדווח ע&quot;י מחשב הצלילה</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="704"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"/>
+        <translation>סמן עומק מקסימלי באדום</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"/>
+        <translation>עומק מקסימלי מחושב</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="738"/>
         <source>show all tissues</source>
-        <translation type="unfinished"/>
+        <translation>הצג כל סוגי רקמות</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="748"/>
@@ -1603,7 +1603,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
-        <translation type="unfinished"/>
+        <translation>שונות</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
@@ -1674,7 +1674,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Dive#</source>
-        <translation type="unfinished"/>
+        <translation>מספר צלילה</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
@@ -1694,7 +1694,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
-        <translation type="unfinished"/>
+        <translation>מדריך</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
@@ -1784,7 +1784,7 @@ Please, remove them first.</source>
         <location filename="../qt-ui/printoptions.ui" line="370"/>
         <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
-        <translation type="unfinished"/>
+        <translation>0</translation>
     </message>
 </context>
 <context>
@@ -1833,7 +1833,7 @@ Please, remove them first.</source>
         <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>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
@@ -1843,12 +1843,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="511"/>
         <source>Scale</source>
-        <translation type="unfinished"/>
+        <translation>קנה מידה</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
         <source>Ruler</source>
-        <translation type="unfinished"/>
+        <translation>סרגל</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
@@ -1868,7 +1868,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="614"/>
         <source>pN</source>
-        <translation type="unfinished"/>
+        <translation>pN</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="640"/>
@@ -1878,7 +1878,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="664"/>
         <source>pO</source>
-        <translation type="unfinished"/>
+        <translation>pO</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="752"/>
@@ -1915,7 +1915,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1606"/>
         <source>unknown</source>
-        <translation type="unfinished"/>
+        <translation>לא ידוע</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1611"/>
@@ -2095,17 +2095,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/>
         <source>Connecting...</source>
-        <translation type="unfinished"/>
+        <translation>מתחבר...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
         <source>Download finished</source>
-        <translation type="unfinished"/>
+        <translation>ההורדה הסתיימה</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/>
         <source>Download error: %1</source>
-        <translation type="unfinished"/>
+        <translation>שגיאת הורדה: %1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/>
@@ -2215,12 +2215,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/>
         <source>Operation timed out</source>
-        <translation type="unfinished"/>
+        <translation>הפעולה נכשלה</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/>
         <source>Transfering data...</source>
-        <translation type="unfinished"/>
+        <translation>מעביר נתונים...</translation>
     </message>
 </context>
 <context>
@@ -3224,7 +3224,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished"/>
+        <translation>לא ידוע</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index 5a3c7ba2f..15e2aa21a 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -2182,7 +2182,7 @@ Verwijder deze eerst.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>Verbinding met Webservice</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index 05afb36a4..0b9bcc24f 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -314,7 +314,7 @@ wybrany komputer nurkowy?</translation>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
-        <translation>Początek o</translation>
+        <translation>Początek</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="181"/>
@@ -674,7 +674,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Start time</source>
-        <translation>Początek o</translation>
+        <translation>Początek</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
@@ -740,7 +740,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
-        <translation>Zużycie gazu</translation>
+        <translation>Zużyty gaz</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="463"/>
@@ -2182,7 +2182,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>Połączenie z usługą internetową</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index 9f3d709a7..c8dbec0c7 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -2182,7 +2182,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>Соединение с веб-сервисом</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts
index a3ce292d3..37f6155fd 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -4,12 +4,12 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"/>
+        <translation>Importuj súbor </translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="129"/>
@@ -19,17 +19,17 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="197"/>
         <source>Field Separator</source>
-        <translation type="unfinished"/>
+        <translation>Oddeľovač položiek</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"/>
+        <translation>Configurácia položiek</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Import CSV file</source>
-        <translation type="unfinished"/>
+        <translation>Importuj CSV súbor</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
@@ -49,7 +49,7 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="146"/>
         <source>Cns</source>
-        <translation type="unfinished"/>
+        <translation>Cns</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="163"/>
@@ -59,17 +59,17 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="215"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"/>
+        <translation>Predkonfigurovaný import</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="71"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"/>
+        <translation>Otvor CSV Log súbor</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="71"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"/>
+        <translation>CSV súbory (*.csv)</translation>
     </message>
 </context>
 <context>
@@ -102,32 +102,32 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
-        <translation type="unfinished"/>
+        <translation>Zmeň v</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
-        <translation type="unfinished"/>
+        <translation>He%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>O</source>
-        <translation type="unfinished"/>
+        <translation>O</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="154"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"/>
+        <translation>Kliknutím sem vymažeš fľašu</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="376"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"/>
+        <translation>Flaša nemôže byť vymazaná</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="377"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"/>
+        <translation>Táto fľaša sa používa. Len fšaše nepoužité na ponor môžu byť vymazané.</translation>
     </message>
 </context>
 <context>
@@ -140,13 +140,14 @@
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"/>
+        <translation>Zmazať vybraný počítač?</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>Si si istý, že chceš zmazať
+vybraný počítač?</translation>
     </message>
 </context>
 <context>
@@ -159,7 +160,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="1233"/>
         <source>Device ID</source>
-        <translation type="unfinished"/>
+        <translation>ID zariadenia</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1233"/>
@@ -169,7 +170,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="1255"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"/>
+        <translation>Kliknutín sem vymažeš počítač.</translation>
     </message>
 </context>
 <context>
@@ -177,12 +178,12 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> l/min</source>
-        <translation type="unfinished"/>
+        <translation>l/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> cuft/min</source>
-        <translation type="unfinished"/>
+        <translation>cuft/min</translation>
     </message>
 </context>
 <context>
@@ -190,67 +191,67 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="42"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"/>
+        <translation>Zobraz vyhľadávací box</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="704"/>
         <source>expand all</source>
-        <translation type="unfinished"/>
+        <translation>zobraz všetky</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="705"/>
         <source>collapse all</source>
-        <translation type="unfinished"/>
+        <translation>zblaľ všetky</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>collapse others</source>
-        <translation type="unfinished"/>
+        <translation>zbaľ ostatné</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"/>
+        <translation>vymaž ponor(y) z akcie</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="709"/>
         <source>create new trip above</source>
-        <translation type="unfinished"/>
+        <translation>vytvor novú akciu vyššie</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>add dive(s) to trip immediately above</source>
-        <translation type="unfinished"/>
+        <translation>pridaj ponor(y) do akcie hneď nad</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="713"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"/>
+        <translation>spoj akciu s akciou vyššie</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="714"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"/>
+        <translation>spoj akciu s akciou nižšie</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"/>
+        <translation>zmaž ponor(y)</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>mark dive(s) invalid</source>
-        <translation type="unfinished"/>
+        <translation>označ neplatné ponor(y)</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="726"/>
         <source>save As</source>
-        <translation type="unfinished"/>
+        <translation>ulož ako</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"/>
+        <translation>exportuj ako UDDF</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="728"/>
@@ -260,27 +261,27 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="731"/>
         <source>upload dive(s) to divelogs.de</source>
-        <translation type="unfinished"/>
+        <translation>nahraj ponor(y) na </translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="757"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"/>
+        <translation>Ulož ponory ako...</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="776"/>
         <source>Save File as</source>
-        <translation type="unfinished"/>
+        <translation>Ulož súbor ako</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"/>
+        <translation>UDDF súbory (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="724"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"/>
+        <translation>zluč vybrané ponory</translation>
     </message>
 </context>
 <context>
@@ -288,37 +289,37 @@
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"/>
+        <translation>SAC na dne</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"/>
+        <translation>SAC na DECO zastávke</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
-        <translation type="unfinished"/>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
-        <translation type="unfinished"/>
+        <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="125"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"/>
+        <translation>Posledná zastávka v 6m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
-        <translation type="unfinished"/>
+        <translation>Začiatok</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"/>
+        <translation>ATM tlak</translation>
     </message>
 </context>
 <context>
@@ -326,12 +327,12 @@
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"/>
+        <translation>10m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"/>
+        <translation>30 stôp</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="386"/>
@@ -342,7 +343,8 @@
         <location filename="../qt-ui/diveplanner.cpp" line="387"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"/>
+        <translation>Jedna alebo viac zastávok budu touto operáciou zrušené.
+Vymaž ich prosím.</translation>
     </message>
 </context>
 <context>
@@ -355,7 +357,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
         <source>Final Depth</source>
-        <translation type="unfinished"/>
+        <translation>Cieľová hĺbka</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
@@ -365,7 +367,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1101"/>
         <source>Used Gas</source>
-        <translation type="unfinished"/>
+        <translation>Použitá zmes</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1102"/>
@@ -375,12 +377,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1307"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"/>
+        <translation>Vymazať plán?</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1308"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"/>
+        <translation>Chystáš sa vymazať svoj plán.</translation>
     </message>
 </context>
 <context>
@@ -393,7 +395,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="960"/>
         <source>Available Gases</source>
-        <translation type="unfinished"/>
+        <translation>Zmesi k dispozícií</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="977"/>
@@ -411,7 +413,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1138"/>
         <source>date</source>
-        <translation type="unfinished"/>
+        <translation>dátum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1140"/>
@@ -441,7 +443,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1144"/>
         <source>suit</source>
-        <translation type="unfinished"/>
+        <translation>oblek</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
@@ -451,7 +453,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>location</source>
-        <translation type="unfinished"/>
+        <translation>lokalita</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
@@ -474,94 +476,95 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/>
         <source>Invalid response from server</source>
-        <translation type="unfinished"/>
+        <translation>Neplatná odpoveď zo servera</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
-        <translation type="unfinished"/>
+        <translation>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
-        <translation type="unfinished"/>
+        <translation>Očakávaný XML tag &apos;DiveDates&apos; nebol nájdený</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/>
         <source>Malformed XML response. Line %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>Nekorektná XML odpoveď. Riadok %1: %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/>
         <source>Cannot create DLD file</source>
-        <translation type="unfinished"/>
+        <translation>Nemôžem vytvoriť DLD súbor</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/>
         <source>Done</source>
-        <translation type="unfinished"/>
+        <translation>Hotovo</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/>
         <source>Uploading dive list...</source>
-        <translation type="unfinished"/>
+        <translation>Nahrávanie zoznamu ponorov...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/>
         <source>Downloading dive list...</source>
-        <translation type="unfinished"/>
+        <translation>Sťahovanie zoznamu ponorov...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/>
         <source>Downloading %1 dives...</source>
-        <translation type="unfinished"/>
+        <translation>Sťahovanie %1 ponorov...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/>
         <source>Download finished - %1</source>
-        <translation type="unfinished"/>
+        <translation>Sťahovanie ukončené</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/>
         <source>Corrupted download</source>
-        <translation type="unfinished"/>
+        <translation>Poškodené sťahovanie</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/>
         <source>The archive could not be opened:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Nemôžem otvoriť archív:
+</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
         <source>Upload failed</source>
-        <translation type="unfinished"/>
+        <translation>Nahrávanie zlýhalo</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/>
         <source>Upload successful</source>
-        <translation type="unfinished"/>
+        <translation>Úspešne nahrávanie</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/>
         <source>Login failed</source>
-        <translation type="unfinished"/>
+        <translation>Prihlásenie zlýhalo</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/>
         <source>Cannot parse response</source>
-        <translation type="unfinished"/>
+        <translation>Neviem spracovať odpoveď</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Chyba:</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/>
         <source>Upload finished</source>
-        <translation type="unfinished"/>
+        <translation>Nahrávanie ukončené</translation>
     </message>
 </context>
 <context>
@@ -570,7 +573,7 @@ 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>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
@@ -593,22 +596,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
         <source>Vendor</source>
-        <translation type="unfinished"/>
+        <translation>Výrobca</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="32"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"/>
+        <translation>Počítač</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"/>
+        <translation>Zariadenie alebo bod pripojenia</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
@@ -618,17 +621,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"/>
+        <translation>Vždy preferuj nahraté ponory</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
         <source>OK</source>
-        <translation type="unfinished"/>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Zruš</translation>
     </message>
 </context>
 <context>
@@ -636,7 +639,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/globe.cpp" line="104"/>
         <source>Edit Selected Dive Locations</source>
-        <translation type="unfinished"/>
+        <translation>Edituj označené potápašské lokality</translation>
     </message>
 </context>
 <context>
@@ -656,7 +659,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Coordinates</source>
-        <translation type="unfinished"/>
+        <translation>Koordináty</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="169"/>
@@ -676,17 +679,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <source>Air temp</source>
-        <translation type="unfinished"/>
+        <translation>Teplota vzduchu</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <source>Water temp</source>
-        <translation type="unfinished"/>
+        <translation>Teplota vody</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Tags</source>
-        <translation type="unfinished"/>
+        <translation>Značky</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="192"/>
@@ -727,17 +730,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
-        <translation type="unfinished"/>
+        <translation>Interval</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
-        <translation type="unfinished"/>
+        <translation>Použité zmesi</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"/>
+        <translation>Spotrebovaná zmes</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="463"/>
@@ -748,12 +751,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"/>
+        <translation>Max. hĺbka</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"/>
+        <translation>Priem. hĺbka</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="520"/>
@@ -763,17 +766,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"/>
+        <translation>Tlak vzduchu</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"/>
+        <translation>Teplota vzduchu</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"/>
+        <translation>Teplota vody</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="596"/>
@@ -783,7 +786,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
-        <translation type="unfinished"/>
+        <translation>Slanosť</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="652"/>
@@ -823,53 +826,53 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Pridaj fľašu</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
-        <translation type="unfinished"/>
+        <translation>Závažia</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="78"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"/>
+        <translation>Pridaj závažia</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
-        <translation type="unfinished"/>
+        <translation>Lokalita</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="386"/>
         <location filename="../qt-ui/maintab.cpp" line="410"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"/>
+        <translation>Poznámky</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
-        <translation type="unfinished"/>
+        <translation>Ulož</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Zruš</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="231"/>
         <source>This trip is being edited.</source>
-        <translation type="unfinished"/>
+        <translation>Táto akcia je editovaná.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="237"/>
         <source>Multiple dives are being edited.</source>
-        <translation type="unfinished"/>
+        <translation>Viaceré ponory sú editované.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="239"/>
         <source>This dive is being edited.</source>
-        <translation type="unfinished"/>
+        <translation>Tento ponor sa edituje.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="454"/>
@@ -878,7 +881,7 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.cpp" line="492"/>
         <location filename="../qt-ui/maintab.cpp" line="493"/>
         <source>/min</source>
-        <translation type="unfinished"/>
+        <translation>/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="456"/>
@@ -916,32 +919,32 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Súbor</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Log</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Náhľad</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Help</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Import</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Nový logbook</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
@@ -951,37 +954,37 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Otvor logbook</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
-        <translation type="unfinished"/>
+        <translation>Otvor</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ulož</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
-        <translation type="unfinished"/>
+        <translation>Ulož</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="278"/>
@@ -992,7 +995,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="289"/>
@@ -1003,79 +1006,79 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
         <location filename="../qt-ui/mainwindow.cpp" line="171"/>
         <source>Import Files</source>
-        <translation type="unfinished"/>
+        <translation>Importuj súbory</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"/>
+        <translation>Export &amp;UDDF</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tlač</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+,</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ukončiť</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="349"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"/>
+        <translation>Import z &amp;počítača</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"/>
+        <translation>Import &amp;GPS data z Subsurface služby</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="360"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Edituj názov zariadenia</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl++</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="378"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Prečisluj</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="381"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="394"/>
@@ -1085,17 +1088,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="399"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ročná štatistika</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="402"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="407"/>
         <source>Dive List</source>
-        <translation type="unfinished"/>
+        <translation>Zoznam ponorov</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="415"/>
@@ -1110,47 +1113,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>All</source>
-        <translation type="unfinished"/>
+        <translation>Všetky</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"/>
+        <translation>Užívateľský &amp;Manual</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Globe</source>
-        <translation type="unfinished"/>
+        <translation>Zemeguľa</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"/>
+        <translation>P&amp;lanuj ponor</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="492"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Import CSV</source>
-        <translation type="unfinished"/>
+        <translation>Import CSV</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="500"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"/>
+        <translation>Import CS&amp;V</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"/>
+        <translation>Import z Divelogs.de</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="327"/>
@@ -1160,42 +1163,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="341"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="352"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="370"/>
         <source>Add Dive</source>
-        <translation type="unfinished"/>
+        <translation>Pridaj ponor</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="389"/>
         <source>Auto Group</source>
-        <translation type="unfinished"/>
+        <translation>Automatické zgrupovanie</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="410"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+2</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="418"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+3</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="426"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+4</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="434"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="439"/>
@@ -1205,7 +1208,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="442"/>
         <source>Left</source>
-        <translation type="unfinished"/>
+        <translation>Ľavý</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="447"/>
@@ -1215,7 +1218,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="450"/>
         <source>Right</source>
-        <translation type="unfinished"/>
+        <translation>Pravý</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="455"/>
@@ -1235,12 +1238,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="476"/>
         <source>F1</source>
-        <translation type="unfinished"/>
+        <translation>F1</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="484"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+5</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="113"/>
@@ -1251,17 +1254,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="148"/>
         <location filename="../qt-ui/mainwindow.cpp" line="254"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
-        <translation type="unfinished"/>
+        <translation>Ulož alebo zruš aktuálne editovanie ponoru pred zatvorením súboru.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="227"/>
         <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation type="unfinished"/>
+        <translation>Ulož alebo zruš aktuálne editovanie ponoru pred plánovanim ponoru.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="290"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
-        <translation type="unfinished"/>
+        <translation>Ulož alebo zruš aktuálne editovanie ponoru pred pridaním nového ponoru.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="502"/>
@@ -1271,17 +1274,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="506"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"/>
+        <translation>Neviem nájsť manuál</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="543"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"/>
+        <translation>Chceš uložiť zmeny prevedené v súbore %1?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="545"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"/>
+        <translation>Chces uložiť zmeny prevedené v dátovom súbore?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="550"/>
@@ -1291,18 +1294,18 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="551"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"/>
+        <translation>Zmeny budu stratené ak ich neuložíš.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="867"/>
         <source>First finish the current edition before trying to do another.</source>
-        <translation type="unfinished"/>
+        <translation>Ulož alebo zruš aktuálne editovanie ponoru pred začatím editovania iného ponoru.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="200"/>
         <location filename="../qt-ui/mainwindow.cpp" line="745"/>
         <source>Save File as</source>
-        <translation type="unfinished"/>
+        <translation>Ulož súbor ako</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
@@ -1312,22 +1315,22 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="290"/>
         <location filename="../qt-ui/mainwindow.cpp" line="867"/>
         <source>Warning</source>
-        <translation type="unfinished"/>
+        <translation>Upozornenie</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation type="unfinished"/>
+        <translation>Ulož alebo zruš aktuálne editovanie ponoru pred otvorením nového súboru.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="201"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"/>
+        <translation>UDDF súbory (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="746"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -1335,7 +1338,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
         <source>Defaults</source>
-        <translation type="unfinished"/>
+        <translation>Predvolené</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="95"/>
@@ -1345,27 +1348,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="105"/>
         <source>Graph</source>
-        <translation type="unfinished"/>
+        <translation>Graf</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="115"/>
         <source>Language</source>
-        <translation type="unfinished"/>
+        <translation>Jazyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"/>
+        <translation>Zoznamy a tabuľky</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
-        <translation type="unfinished"/>
+        <translation>Font</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
-        <translation type="unfinished"/>
+        <translation>Veľkosť fontu</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="170"/>
@@ -1375,47 +1378,47 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="176"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"/>
+        <translation>Predvolený súbor s ponormi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"/>
+        <translation>Zobraz neplatné</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Predvolená fľaša</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="220"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Použi prednastavenú fľašu</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
-        <translation type="unfinished"/>
+        <translation>Systém</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
-        <translation type="unfinished"/>
+        <translation>Metrický</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
-        <translation type="unfinished"/>
+        <translation>Imperiálny</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
-        <translation type="unfinished"/>
+        <translation>Personalizácia</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="307"/>
@@ -1425,12 +1428,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>meter</source>
-        <translation type="unfinished"/>
+        <translation>meter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
         <source>feet</source>
-        <translation type="unfinished"/>
+        <translation>stopa</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
@@ -1445,22 +1448,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>liter</source>
-        <translation type="unfinished"/>
+        <translation>liter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
         <source>cu ft</source>
-        <translation type="unfinished"/>
+        <translation>cu ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="395"/>
         <source>celsius</source>
-        <translation type="unfinished"/>
+        <translation>celsius</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="405"/>
         <source>fahrenheit</source>
-        <translation type="unfinished"/>
+        <translation>fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="422"/>
@@ -1470,17 +1473,17 @@ Please, remove them first.</source>
     <message utf8="true">
         <location filename="../qt-ui/preferences.ui" line="510"/>
         <source>pO₂</source>
-        <translation type="unfinished"/>
+        <translation>pO₂</translation>
     </message>
     <message utf8="true">
         <location filename="../qt-ui/preferences.ui" line="551"/>
         <source>pN₂</source>
-        <translation type="unfinished"/>
+        <translation>pN₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>System Default</source>
-        <translation type="unfinished"/>
+        <translation>Systémove prednastavenia</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="857"/>
@@ -1495,7 +1498,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="361"/>
         <source>Volume</source>
-        <translation type="unfinished"/>
+        <translation>Objem</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="388"/>
@@ -1515,7 +1518,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
-        <translation type="unfinished"/>
+        <translation>Časové jednotky</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="453"/>
@@ -1525,84 +1528,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
-        <translation type="unfinished"/>
+        <translation>Minuty</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
-        <translation type="unfinished"/>
+        <translation>Sekundy</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
-        <translation type="unfinished"/>
+        <translation>Zobraz</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="533"/>
         <location filename="../qt-ui/preferences.ui" line="574"/>
         <location filename="../qt-ui/preferences.ui" line="615"/>
         <source>threshold</source>
-        <translation type="unfinished"/>
+        <translation>hranica</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
-        <translation type="unfinished"/>
+        <translation>pHe</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
-        <translation type="unfinished"/>
+        <translation>MOD</translation>
     </message>
     <message utf8="true">
         <location filename="../qt-ui/preferences.ui" line="656"/>
         <source>max ppO₂</source>
-        <translation type="unfinished"/>
+        <translation>max ppO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"/>
+        <translation>EAD END EADD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="681"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"/>
+        <translation>Strop hlásený počítačom</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="704"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"/>
+        <translation>zobraz strop červenou</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"/>
+        <translation>Zrátaný strop</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="738"/>
         <source>show all tissues</source>
-        <translation type="unfinished"/>
+        <translation>zobraz všetky tkanivá</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
-        <translation type="unfinished"/>
+        <translation>3m krok</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="758"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"/>
+        <translation>Zrátaj </translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="821"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"/>
+        <translation>GFLow na max. hĺbke</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
-        <translation type="unfinished"/>
+        <translation>Rôzne</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
@@ -1617,32 +1620,32 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
-        <translation type="unfinished"/>
+        <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
-        <translation type="unfinished"/>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="195"/>
         <source>Restart required</source>
-        <translation type="unfinished"/>
+        <translation>Potrebný reštart</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="196"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
-        <translation type="unfinished"/>
+        <translation>Na korrektné nahratie nového jazyka je potrebné reštartovať Subsurface.</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="229"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"/>
+        <translation>Otvor predvolený Log súbor</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="229"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -1650,22 +1653,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="39"/>
         <source>&amp;Preview</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Náhľad</translation>
     </message>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="43"/>
         <source>P&amp;rint</source>
-        <translation type="unfinished"/>
+        <translation>T&amp;lač</translation>
     </message>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="47"/>
         <source>&amp;Close</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Zatvor</translation>
     </message>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
-        <translation type="unfinished"/>
+        <translation>Tlač</translation>
     </message>
 </context>
 <context>
@@ -1711,7 +1714,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
-        <translation type="unfinished"/>
+        <translation>Možnosti tlače</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="41"/>
@@ -1766,24 +1769,24 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"/>
+        <translation>Výška profilu </translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"/>
+        <translation>Vyška ostatných údajov </translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"/>
+        <translation>Výška poznámok </translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="354"/>
         <location filename="../qt-ui/printoptions.ui" line="370"/>
         <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
-        <translation type="unfinished"/>
+        <translation>0</translation>
     </message>
 </context>
 <context>
@@ -1791,7 +1794,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
-        <translation type="unfinished"/>
+        <translation>Pridaj zmenu zmesi</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
@@ -1801,38 +1804,38 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
-        <translation type="unfinished"/>
+        <translation>Vymaž udalosť</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
-        <translation type="unfinished"/>
+        <translation>Schovaj podobné udalosti</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide events</source>
-        <translation type="unfinished"/>
+        <translation>Schovaj udalosti</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="202"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"/>
+        <translation>Schovať všetky %1 udalosti?</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"/>
+        <translation>Zmazať vybrané udalosti?</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="224"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"/>
+        <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>neznámy počítač</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
@@ -1842,12 +1845,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="511"/>
         <source>Scale</source>
-        <translation type="unfinished"/>
+        <translation>Stupnica</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="512"/>
         <source>Ruler</source>
-        <translation type="unfinished"/>
+        <translation>Pravítko</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
@@ -1857,7 +1860,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="515"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"/>
+        <translation>Zväčši ponor na veľkosť obrazovky</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
@@ -1867,17 +1870,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="614"/>
         <source>pN</source>
-        <translation type="unfinished"/>
+        <translation>pN</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="640"/>
         <source>pHe</source>
-        <translation type="unfinished"/>
+        <translation>pHe</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="664"/>
         <source>pO</source>
-        <translation type="unfinished"/>
+        <translation>pO</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="752"/>
@@ -1889,7 +1892,7 @@ Please, remove them first.</source>
         <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>EAN%1</source>
-        <translation type="unfinished"/>
+        <translation>EAN%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1014"/>
@@ -1919,57 +1922,57 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1611"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"/>
+        <translation>Ponor #%1 - %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1614"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"/>
+        <translation>Max hĺbka: %1 %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1621"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"/>
+        <translation>Trvanie: %1 min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Gas Used:</source>
-        <translation type="unfinished"/>
+        <translation>Použitá zmes:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1628"/>
         <source>SAC:</source>
-        <translation type="unfinished"/>
+        <translation>SAC:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Max. CNS:</source>
-        <translation type="unfinished"/>
+        <translation>Max. CNS:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1632"/>
         <source>Weights:</source>
-        <translation type="unfinished"/>
+        <translation>Závažia:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Notes:</source>
-        <translation type="unfinished"/>
+        <translation>Poznámky:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Divemaster:</source>
-        <translation type="unfinished"/>
+        <translation>Divemaster:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>Buddy:</source>
-        <translation type="unfinished"/>
+        <translation>Buddy:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1648"/>
         <source>Suit:</source>
-        <translation type="unfinished"/>
+        <translation>Oblek:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1650"/>
@@ -1979,7 +1982,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Rating:</source>
-        <translation type="unfinished"/>
+        <translation>Hodnotenie:</translation>
     </message>
 </context>
 <context>
@@ -2017,7 +2020,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/globe.cpp" line="242"/>
         <source>Move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
+        <translation>Posuň mapu a dvojklikom označ miesto ponoru</translation>
     </message>
 </context>
 <context>
@@ -2048,17 +2051,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="73"/>
         <source>h:mm</source>
-        <translation type="unfinished"/>
+        <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="83"/>
         <source>earlier</source>
-        <translation type="unfinished"/>
+        <translation>skôr</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>later</source>
-        <translation type="unfinished"/>
+        <translation>neskôr</translation>
     </message>
 </context>
 <context>
@@ -2071,17 +2074,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.cpp" line="19"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013&lt;/span&gt;</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;License</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Licencia</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="24"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Web stránka</translation>
     </message>
 </context>
 <context>
@@ -2099,12 +2102,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
         <source>Download finished</source>
-        <translation type="unfinished"/>
+        <translation>Sťahovanie ukončené</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/>
         <source>Download error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Chyba sťahovania</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/>
@@ -2132,7 +2135,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Pridaj flašu</translation>
     </message>
 </context>
 <context>
@@ -2140,12 +2143,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="759"/>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Popis</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="759"/>
         <source>ml</source>
-        <translation type="unfinished"/>
+        <translation>ml</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="759"/>
@@ -2158,7 +2161,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="1548"/>
         <source>Information</source>
-        <translation type="unfinished"/>
+        <translation>Informácie</translation>
     </message>
 </context>
 <context>
@@ -2166,7 +2169,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="631"/>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Popis</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="631"/>
@@ -2179,27 +2182,27 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>Webservice Connection</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
         <source>Status:</source>
-        <translation type="unfinished"/>
+        <translation>Status:</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="32"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"/>
+        <translation>Vlož svoje ID</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="39"/>
         <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Stiahnutie</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="63"/>
         <source>User ID</source>
-        <translation type="unfinished"/>
+        <translation>ID užívateľa</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="80"/>
@@ -2209,17 +2212,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Nahratie</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/>
         <source>Operation timed out</source>
-        <translation type="unfinished"/>
+        <translation>Čas operácie vypršal</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/>
         <source>Transfering data...</source>
-        <translation type="unfinished"/>
+        <translation>Prenášanie dát...</translation>
     </message>
 </context>
 <context>
@@ -2237,7 +2240,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="451"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"/>
+        <translation>Kliknutim sem vymažeš záťažový systém.</translation>
     </message>
 </context>
 <context>
@@ -2246,7 +2249,8 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1409"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"/>
+        <translation>Rok 
+ &gt; Mesiac / Akcia</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1410"/>
@@ -2257,31 +2261,33 @@ Please, remove them first.</source>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"/>
+        <translation>Trvanie
+Celkové</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>
 Average</source>
-        <translation type="unfinished"/>
+        <translation>Priemer</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"/>
+        <translation>Najkratší</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Longest</source>
-        <translation type="unfinished"/>
+        <translation>Najdlhší</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"/>
+        <translation>Hĺbka (%1)
+ Priemer</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
@@ -2289,7 +2295,8 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"/>
+        <translation>
+Minimum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
@@ -2297,19 +2304,22 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"/>
+        <translation>
+Maximum</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"/>
+        <translation>SAC (%1)
+ Priemer</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"/>
+        <translation>Teml. (%1)
+ Priemer</translation>
     </message>
 </context>
 <context>
@@ -2425,13 +2435,13 @@ Maximum</source>
         <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>Chyba pri čítaní &apos;%s&apos;. Použi import pre CSV súbory.</translation>
     </message>
     <message>
         <location filename="../file.c" line="351"/>
         <location filename="../file.c" line="353"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"/>
+        <translation>Maximálny počet podporovaných stĺpcov pre CSV import je %d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
@@ -2613,7 +2623,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"/>
+        <translation>Chyba pri zisťovaní tlaku na povrchu</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
@@ -2792,7 +2802,8 @@ T:%.1f %s</translation>
         <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"/>
+        <translation>%s
+V:%.2f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1302"/>
@@ -2805,7 +2816,8 @@ Vypočítaná hladina %.0f %s</translation>
         <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"/>
+        <translation>%s
+Tkanivo %.0fmin: %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1256"/>
@@ -2818,13 +2830,15 @@ Bezpečnostná zastávka:%umin @ %.0f %s</translation>
         <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"/>
+        <translation>@:%d:%02d
+D:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"/>
+        <translation>%s
+SAC:%2.1fl/min</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1259"/>
@@ -2911,90 +2925,96 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+Deco:%umin @ %.0f %s (calc)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+V deco (calc)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+NDL:%umin (calc)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+TTS:%umin (calc)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"/>
+        <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1410"/>
         <location filename="../profile.c" line="1414"/>
         <location filename="../profile.c" line="1418"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"/>
+        <translation>%s %sD:%.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1430"/>
         <location filename="../profile.c" line="1434"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sP:%d %s</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
-        <translation type="unfinished"/>
+        <translation>C</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
-        <translation type="unfinished"/>
+        <translation>F</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="469"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"/>
+        <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="482"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"/>
+        <translation>%1 %2, %3
+%4:%5</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"/>
+        <translation>%1 %2 (%3 ponorov)</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"/>
+        <translation>%1 %2 (1 ponor)</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
@@ -3064,12 +3084,12 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"/>
+        <translation>čerstvý</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"/>
+        <translation>študent</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
@@ -3084,7 +3104,7 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"/>
+        <translation>inštruktor</translation>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index 70518641f..0b1703d16 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -241,7 +241,7 @@ radera den valda dykdatorn?</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>mark dive(s) invalid</source>
-        <translation type="unfinished"/>
+        <translation>Markera dyk som ogiltiga</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="726"/>
@@ -261,7 +261,7 @@ radera den valda dykdatorn?</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="731"/>
         <source>upload dive(s) to divelogs.de</source>
-        <translation type="unfinished"/>
+        <translation>Ladda upp dyk till divelogs.de</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="757"/>
@@ -496,13 +496,13 @@ vänligen ta bort dessa först.</translation>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/>
         <source>Cannot create DLD file</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte skapa DLD fil</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/>
         <source>Done</source>
-        <translation type="unfinished"/>
+        <translation>Klar</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/>
@@ -539,27 +539,27 @@ vänligen ta bort dessa först.</translation>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
         <source>Upload failed</source>
-        <translation type="unfinished"/>
+        <translation>Uppladdning misslyckades</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/>
         <source>Upload successful</source>
-        <translation type="unfinished"/>
+        <translation>Nedladdning lyckades</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/>
         <source>Login failed</source>
-        <translation type="unfinished"/>
+        <translation>Inloggning misslyckades</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/>
         <source>Cannot parse response</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte tolka respons</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>Error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Fel: %1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/>
@@ -1870,7 +1870,7 @@ vänligen ta bort dessa först.</translation>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="614"/>
         <source>pN</source>
-        <translation type="unfinished"/>
+        <translation>pN</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="640"/>
@@ -1880,7 +1880,7 @@ vänligen ta bort dessa först.</translation>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="664"/>
         <source>pO</source>
-        <translation type="unfinished"/>
+        <translation>pO</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="752"/>
@@ -2182,7 +2182,7 @@ vänligen ta bort dessa först.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>Anslutning till webbtjänst</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts
index 68e2e2533..0bd507879 100644
--- a/translations/subsurface_zh_TW.ts
+++ b/translations/subsurface_zh_TW.ts
@@ -29,7 +29,7 @@
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
         <source>Import CSV file</source>
-        <translation type="unfinished"/>
+        <translation>匯入 CSV 檔案</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
@@ -102,22 +102,22 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
-        <translation>交換於 </translation>
+        <translation>交換於</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
-        <translation type="unfinished"/>
+        <translation>He%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="68"/>
         <source>O</source>
-        <translation type="unfinished"/>
+        <translation>O</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="154"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation>於此處按下將移除此氣瓶。</translation>
+        <translation>於此處按下將移除此氣瓶.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="376"/>
@@ -127,7 +127,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="377"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation>此為使用氣體。只有在潛水時，未使用的氣體才可以被移除。</translation>
+        <translation>此為使用氣體. 只有在潛水時, 未使用的氣體才可以被移除.</translation>
     </message>
 </context>
 <context>
@@ -140,14 +140,14 @@
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation>移除選擇的潛水電腦？</translation>
+        <translation>移除選擇的潛水電腦?</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>您確認要
-移除選擇的潛水電腦？</translation>
+移除選擇的潛水電腦?</translation>
     </message>
 </context>
 <context>
@@ -160,7 +160,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="1233"/>
         <source>Device ID</source>
-        <translation>裝置ID</translation>
+        <translation>裝置 ID</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1233"/>
@@ -170,7 +170,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="1255"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation>於此處按下將會移除此潛水電腦。</translation>
+        <translation>於此處按下將會移除此潛水電腦.</translation>
     </message>
 </context>
 <context>
@@ -211,7 +211,7 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>remove dive(s) from trip</source>
-        <translation>自旅程中移除潛水(多筆)</translation>
+        <translation>自旅程中移除潛水 (多筆)</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="709"/>
@@ -221,7 +221,7 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>add dive(s) to trip immediately above</source>
-        <translation type="unfinished"/>
+        <translation>新增潛水 (所選) 至旅程上方.</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="713"/>
@@ -236,7 +236,7 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>delete dive(s)</source>
-        <translation>刪除潛水(s)</translation>
+        <translation>刪除潛水 (所選)</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="720"/>
@@ -256,7 +256,7 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="728"/>
         <source>shift times</source>
-        <translation>位移時間</translation>
+        <translation>移動時間</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="731"/>
@@ -343,8 +343,8 @@
         <location filename="../qt-ui/diveplanner.cpp" line="387"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation>在這次流程，有１或多個停留將會被跳過，
-請預先移除它們。</translation>
+        <translation>在這次流程, 有一或多個停留將會被跳過, 
+請預先移除它們.</translation>
     </message>
 </context>
 <context>
@@ -367,7 +367,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1101"/>
         <source>Used Gas</source>
-        <translation>Used Gas 已使用的氣體</translation>
+        <translation>已使用的氣體</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1102"/>
@@ -377,12 +377,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1307"/>
         <source>Discard the Plan?</source>
-        <translation>取消這次計畫？</translation>
+        <translation>取消這次計畫?</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1308"/>
         <source>You are about to discard your plan.</source>
-        <translation>您將要放棄你的計劃。</translation>
+        <translation>您將要放棄你的計劃.</translation>
     </message>
 </context>
 <context>
@@ -443,12 +443,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1144"/>
         <source>suit</source>
-        <translation type="unfinished"/>
+        <translation>防寒衣</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>cyl</source>
-        <translation type="unfinished"/>
+        <translation>氣瓶</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1150"/>
@@ -458,7 +458,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>SAC</source>
-        <translation>耗氣量 SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1148"/>
@@ -476,22 +476,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/>
         <source>Invalid response from server</source>
-        <translation type="unfinished"/>
+        <translation>主機回傳不正確的回應.</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
-        <translation type="unfinished"/>
+        <translation>預期的 XML 標籤 &apos;DiveDateReader&apos;, 取代了 &apos;%1</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
-        <translation type="unfinished"/>
+        <translation>無法找到預期的 XML 標籤 &apos;DiveDates&apos;</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/>
         <source>Malformed XML response. Line %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>異常的 XML 回應. 第 %1 行: %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/>
@@ -507,17 +507,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/>
         <source>Uploading dive list...</source>
-        <translation type="unfinished"/>
+        <translation>上傳潛水列表...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/>
         <source>Downloading dive list...</source>
-        <translation type="unfinished"/>
+        <translation>下載潛水列表...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/>
         <source>Downloading %1 dives...</source>
-        <translation type="unfinished"/>
+        <translation>下載 %1 潛水...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/>
@@ -639,7 +639,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/globe.cpp" line="104"/>
         <source>Edit Selected Dive Locations</source>
-        <translation type="unfinished"/>
+        <translation>編輯所選擇的潛水位置</translation>
     </message>
 </context>
 <context>
@@ -746,7 +746,7 @@ Please, remove them first.</source>
         <location filename="../qt-ui/maintab.ui" line="463"/>
         <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
-        <translation>耗氣量 SAC</translation>
+        <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="482"/>
@@ -862,17 +862,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="231"/>
         <source>This trip is being edited.</source>
-        <translation type="unfinished"/>
+        <translation>此旅程已被編輯.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="237"/>
         <source>Multiple dives are being edited.</source>
-        <translation type="unfinished"/>
+        <translation>此些旅程已被編輯.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="239"/>
         <source>This dive is being edited.</source>
-        <translation type="unfinished"/>
+        <translation>此潛水已被編輯.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="454"/>
@@ -1254,17 +1254,17 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="148"/>
         <location filename="../qt-ui/mainwindow.cpp" line="254"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
-        <translation type="unfinished"/>
+        <translation>在關閉檔案前, 請儲存或取消此次潛水的編輯.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="227"/>
         <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation type="unfinished"/>
+        <translation>在開始計畫潛水前, 請先儲存或取消此次潛水的編輯.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="290"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
-        <translation type="unfinished"/>
+        <translation>在新增潛水前, 請先儲存或取消此次潛水的編輯.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="502"/>
@@ -1279,12 +1279,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="543"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation>您是否要對檔案 %1 所做的修改儲存？</translation>
+        <translation>您是否要對檔案 %1 所做的修改儲存?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="545"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation>您是否要對資料檔案所做的修改進行儲存？</translation>
+        <translation>您是否要對資料檔案所做的修改進行儲存?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="550"/>
@@ -1294,12 +1294,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="551"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation>如果不進行儲存，所做變更將會遺失。</translation>
+        <translation>如果不進行儲存, 所做變更將會遺失.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="867"/>
         <source>First finish the current edition before trying to do another.</source>
-        <translation type="unfinished"/>
+        <translation>在做另一編輯前, 請先結束此次編輯.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="200"/>
@@ -1320,7 +1320,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation type="unfinished"/>
+        <translation>在開啟新檔前, 請儲存或取消此次潛水的編輯.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="201"/>
@@ -1668,7 +1668,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
-        <translation type="unfinished"/>
+        <translation>列印</translation>
     </message>
 </context>
 <context>
@@ -1719,7 +1719,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
-        <translation>只列印所選擇的潛水</translation>
+        <translation>只列印所選的潛水</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="60"/>
@@ -1794,22 +1794,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
         <source>Add Gas Change</source>
-        <translation type="unfinished"/>
+        <translation>增加氣瓶交換</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
         <source>Add Bookmark</source>
-        <translation type="unfinished"/>
+        <translation>增加書籤</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
         <source>Remove Event</source>
-        <translation type="unfinished"/>
+        <translation>移除事件</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
         <source>Hide similar events</source>
-        <translation type="unfinished"/>
+        <translation>隱藏相似事件</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
@@ -1937,22 +1937,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1626"/>
         <source>Gas Used:</source>
-        <translation type="unfinished"/>
+        <translation>消耗氣體: </translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1628"/>
         <source>SAC:</source>
-        <translation type="unfinished"/>
+        <translation>SAC: </translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Max. CNS:</source>
-        <translation type="unfinished"/>
+        <translation>最大 CNS:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1632"/>
         <source>Weights:</source>
-        <translation type="unfinished"/>
+        <translation>配重:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1637"/>
@@ -1977,12 +1977,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1650"/>
         <source>Viz:</source>
-        <translation type="unfinished"/>
+        <translation>Viz:</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Rating:</source>
-        <translation type="unfinished"/>
+        <translation>評分:</translation>
     </message>
 </context>
 <context>
@@ -2041,12 +2041,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="20"/>
         <source>Shift selected times</source>
-        <translation>位移所選擇的時間</translation>
+        <translation>移動所選擇的時間</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="37"/>
         <source>Shift times of selected dives by</source>
-        <translation>位移所選擇潛水的時間，根據 </translation>
+        <translation>移動所選擇潛水的時間，根據 </translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="73"/>
@@ -2074,7 +2074,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.cpp" line="19"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;跨平台潛水日誌軟體&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013&lt;/span&gt;</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
@@ -2148,7 +2148,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="759"/>
         <source>ml</source>
-        <translation type="unfinished"/>
+        <translation>ml</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="759"/>
@@ -2182,7 +2182,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"/>
+        <translation>網頁服務連結</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
@@ -2314,7 +2314,7 @@ Maximum</source>
         <location filename="../qt-ui/models.cpp" line="1418"/>
         <source>SAC (%1)
  Average</source>
-        <translation>耗氣量 (%1)
+        <translation>SAC (%1)
 平均</translation>
     </message>
     <message>
@@ -2438,13 +2438,13 @@ Maximum</source>
         <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>讀取 &apos;%s&apos; 失敗, 使用匯入 CSV 檔案.</translation>
     </message>
     <message>
         <location filename="../file.c" line="351"/>
         <location filename="../file.c" line="353"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"/>
+        <translation>CSV 匯入最大支援 %d 欄位.</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
@@ -2510,7 +2510,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
-        <translation>安全停留 (自發性)</translation>
+        <translation>安全停留 (非必要)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="140"/>
@@ -2536,7 +2536,7 @@ Maximum</source>
         <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
-        <translation type="unfinished"/>
+        <translation>below floor</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
@@ -2586,7 +2586,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
-        <translation>無法解析 %s %s</translation>
+        <translation>無法建立解析 %s %s</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="399"/>
@@ -2626,7 +2626,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"/>
+        <translation>得到錯誤的水面壓力</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
@@ -2646,7 +2646,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
-        <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
+        <translation>型號=%u (0x%08x), 韌體=%u (0x%08x), 序號=%u (0x%08x)</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="666"/>
@@ -2743,7 +2743,7 @@ based on GFlow = %.0f and GFhigh = %.0f
 </source>
         <translation>%s
 Subsurface 潛水計畫
-以 GFlow = %.0f and GFhigh = %.0f 為基礎
+以 GFlow = %.0f 和 GFhigh = %.0f 為基礎
 
 </translation>
     </message>
@@ -2833,13 +2833,15 @@ Safetystop:%umin @ %.0f %s</source>
         <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"/>
+        <translation>@:%d:%02d
+D:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"/>
+        <translation>%s
+SAC:%2.1fl/min</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1259"/>
@@ -2926,25 +2928,29 @@ EADD:%d%s</translation>
         <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+Deco:%umin @ %.0f %s (計算)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+In deco (計算)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+NDL:%umin (預計)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+TTS:%umin (預計)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1406"/>
@@ -2968,13 +2974,13 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1430"/>
         <location filename="../profile.c" line="1434"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1441"/>
@@ -2994,23 +3000,24 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../qt-gui.cpp" line="469"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"/>
+        <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="482"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"/>
+        <translation>%1 %2, %3
+%4:%5</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"/>
+        <translation>%1 %2 (%3 潛水)</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"/>
+        <translation>%1 %2 (1 潛水)</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
@@ -3080,12 +3087,12 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"/>
+        <translation>新進</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"/>
+        <translation>學生</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
@@ -3100,7 +3107,7 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"/>
+        <translation>教練</translation>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
@@ -3280,7 +3287,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
         <source>Reading %s %s</source>
-        <translation>讀取%s %s</translation>
+        <translation>讀取 %s %s</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="377"/>
-- 
cgit v1.2.3-70-g09d2