diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts
index f2079c5be..43aa72f6e 100644
--- a/translations/subsurface_source.ts
+++ b/translations/subsurface_source.ts
@@ -11,7 +11,7 @@
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="488"/>
-        <source>Searches for Buddies and Divemasters</source>
+        <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -19,7 +19,7 @@
     <name>BuddyFilterModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="2430"/>
-        <source>No Buddies</source>
+        <source>No buddies</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -47,7 +47,7 @@
     </message>
     <message>
         <location filename="../configuredivecomputer.cpp" line="585"/>
-        <source>Device settings successfully resetted</source>
+        <source>Device settings successfully reset</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -349,11 +349,6 @@
         <source>Read settings from backup file or from device before writing to a backup file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
-        <source>Suunto Vyper Family</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/>
         <source>OSTC, Mk.2/2N/2C</source>
@@ -411,7 +406,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/>
         <source>Advanced Settings</source>
         <translation type="unfinished"></translation>
@@ -422,6 +416,16 @@
         <source>Alt GF can be selected underwater</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Suunto Vyper family</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/>
+        <source>Advanced settings</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/>
@@ -658,12 +662,25 @@
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/>
+        <source>ppO₂ max</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/>
+        <source>ppO₂ min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/>
+        <source>Total dive time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/>
         <source>ppO2 max</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/>
         <source>ppO2 min</source>
         <translation type="unfinished"></translation>
@@ -732,11 +749,6 @@
         <source>60s</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/>
-        <source>Total divetime</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/>
         <source>Computer model</source>
@@ -1882,7 +1894,7 @@
     </message>
     <message>
         <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/>
-        <source>Get UserID</source>
+        <source>Get user ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2267,7 +2279,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/listfilter.ui" line="22"/>
-        <source>TextLabel</source>
+        <source>Text label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2314,7 +2326,7 @@ p, li { white-space: pre-wrap; }
     <name>LocationFilterModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="2547"/>
-        <source>No Location set</source>
+        <source>No location set</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2929,7 +2941,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="840"/>
-        <source>&amp;Filter by Tags</source>
+        <source>&amp;Filter by tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
+        <source>Toggle tissue graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2937,12 +2954,6 @@ p, li { white-space: pre-wrap; }
         <source>Ctrl+F</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="855"/>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
-        <source>Toggle Tissue Graph</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>&amp;Print</source>
@@ -3148,11 +3159,6 @@ p, li { white-space: pre-wrap; }
         <source>Open dive log file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1250"/>
-        <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="759"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
@@ -3176,6 +3182,11 @@ p, li { white-space: pre-wrap; }
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="1250"/>
+        <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto files(*.sde *.db);;CSV files(*.csv);;MkVI files(*.txt);;All files(*)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="1281"/>
         <source>Please, first finish the current edition before trying to do another.</source>