diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index 41f726894..a962078be 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_ca.ts b/translations/subsurface_ca.ts
index 84d69f8a5..5aa3c229c 100644
--- a/translations/subsurface_ca.ts
+++ b/translations/subsurface_ca.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_cs.ts b/translations/subsurface_cs.ts
index 5a3a3de31..811d4b3b3 100644
--- a/translations/subsurface_cs.ts
+++ b/translations/subsurface_cs.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts
index 1a640bf4d..e39a90fe0 100644
--- a/translations/subsurface_da_DK.ts
+++ b/translations/subsurface_da_DK.ts
@@ -990,7 +990,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1003,7 +1003,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1011,7 +1011,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1019,7 +1019,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1027,7 +1027,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1040,7 +1040,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1053,7 +1053,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1061,7 +1061,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts
index d44b03b69..49b5cb0b6 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index 9745043f3..ff99b8582 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -990,7 +990,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1003,7 +1003,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1011,7 +1011,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1019,7 +1019,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1027,7 +1027,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1040,7 +1040,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1053,7 +1053,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1061,7 +1061,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
@@ -14718,4 +14718,4 @@ p, li { white-space: pre-wrap; }
         <translation>Netzwerkfehler %1</translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts
index 3bce520ba..dee6f0d19 100644
--- a/translations/subsurface_el_GR.ts
+++ b/translations/subsurface_el_GR.ts
@@ -989,7 +989,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1002,7 +1002,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1010,7 +1010,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1018,7 +1018,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1026,7 +1026,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1039,7 +1039,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1052,7 +1052,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1060,7 +1060,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts
index cb4aedd99..319eab3a8 100644
--- a/translations/subsurface_en_GB.ts
+++ b/translations/subsurface_en_GB.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_en_US.ts b/translations/subsurface_en_US.ts
index 24e928d61..28496a21e 100644
--- a/translations/subsurface_en_US.ts
+++ b/translations/subsurface_en_US.ts
@@ -35,7 +35,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddDivesToTrip</name>
+    <name>Command</name>
     <message numerus="yes">
         <location filename="../commands/command_divelist.cpp" line="709"/>
         <source>add %n dives to trip</source>
@@ -46,7 +46,7 @@
     </message>
 </context>
 <context>
-    <name>Command::DeleteDive</name>
+    <name>Command</name>
     <message numerus="yes">
         <location filename="../commands/command_divelist.cpp" line="549"/>
         <source>delete %n dive(s)</source>
@@ -57,7 +57,7 @@
     </message>
 </context>
 <context>
-    <name>Command::DeleteDiveSites</name>
+    <name>Command</name>
     <message numerus="yes">
         <location filename="../commands/command_divesite.cpp" line="136"/>
         <source>delete %n dive site(s)</source>
@@ -68,7 +68,7 @@
     </message>
 </context>
 <context>
-    <name>Command::ImportDives</name>
+    <name>Command</name>
     <message numerus="yes">
         <location filename="../commands/command_divelist.cpp" line="468"/>
         <source>import %n dive(s) from %1</source>
@@ -79,7 +79,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveDivesFromTrip</name>
+    <name>Command</name>
     <message numerus="yes">
         <location filename="../commands/command_divelist.cpp" line="685"/>
         <source>remove %n dive(s) from trip</source>
@@ -90,7 +90,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenumberDives</name>
+    <name>Command</name>
     <message numerus="yes">
         <location filename="../commands/command_divelist.cpp" line="633"/>
         <source>renumber %n dive(s)</source>
@@ -101,7 +101,7 @@
     </message>
 </context>
 <context>
-    <name>Command::ShiftTime</name>
+    <name>Command</name>
     <message numerus="yes">
         <location filename="../commands/command_divelist.cpp" line="585"/>
         <source>shift time of %n dives</source>
diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts
index 178be70e8..a229ffc8c 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index a930e5c2f..1d2336767 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts
index b23d7d7e0..d04139d5a 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index 6cee81a08..f84b436a7 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts
index e9de1cccc..035981a84 100644
--- a/translations/subsurface_he.ts
+++ b/translations/subsurface_he.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts
index 2cdf4e329..a2f7c31f7 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts
index 975b52af1..cc55e3e16 100644
--- a/translations/subsurface_hu.ts
+++ b/translations/subsurface_hu.ts
@@ -989,7 +989,7 @@ Nyomd meg a mentés gombot.</translation>
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1002,7 +1002,7 @@ Nyomd meg a mentés gombot.</translation>
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1010,7 +1010,7 @@ Nyomd meg a mentés gombot.</translation>
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1018,7 +1018,7 @@ Nyomd meg a mentés gombot.</translation>
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1026,7 +1026,7 @@ Nyomd meg a mentés gombot.</translation>
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1039,7 +1039,7 @@ Nyomd meg a mentés gombot.</translation>
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1052,7 +1052,7 @@ Nyomd meg a mentés gombot.</translation>
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1060,7 +1060,7 @@ Nyomd meg a mentés gombot.</translation>
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts
index 7d05f9bd5..233ddb059 100644
--- a/translations/subsurface_id.ts
+++ b/translations/subsurface_id.ts
@@ -988,7 +988,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1001,7 +1001,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1009,7 +1009,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1017,7 +1017,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1025,7 +1025,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1038,7 +1038,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1051,7 +1051,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1059,7 +1059,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts
index 0d343bb38..5d000bf34 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts
index df12bf3cd..aa92365c4 100644
--- a/translations/subsurface_lv_LV.ts
+++ b/translations/subsurface_lv_LV.ts
@@ -987,7 +987,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1000,7 +1000,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1008,7 +1008,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1016,7 +1016,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1024,7 +1024,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1037,7 +1037,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1050,7 +1050,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1058,7 +1058,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index 6278081f6..116a0fe6e 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -987,7 +987,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1000,7 +1000,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1008,7 +1008,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1016,7 +1016,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1024,7 +1024,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1037,7 +1037,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1050,7 +1050,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1058,7 +1058,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index 59a8bdd0d..b40f97e28 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index 084bc2da8..4334cebd6 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts
index c39539d79..3a14c5be8 100644
--- a/translations/subsurface_pt_BR.ts
+++ b/translations/subsurface_pt_BR.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts
index 580f65fbb..6d58b5661 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts
index 227b13d47..085020b94 100644
--- a/translations/subsurface_ro_RO.ts
+++ b/translations/subsurface_ro_RO.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index 86c96f253..90c070dc8 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts
index 46f84fe45..229a8d51e 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -987,7 +987,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1000,7 +1000,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1008,7 +1008,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1016,7 +1016,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1024,7 +1024,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1037,7 +1037,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1050,7 +1050,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1058,7 +1058,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index d1f03a477..767859efd 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts
index b758064a8..95abe9f9a 100644
--- a/translations/subsurface_tr.ts
+++ b/translations/subsurface_tr.ts
@@ -987,7 +987,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1000,7 +1000,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1008,7 +1008,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1016,7 +1016,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1024,7 +1024,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1037,7 +1037,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1050,7 +1050,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1058,7 +1058,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts
index 947dc201b..a31c3b40d 100644
--- a/translations/subsurface_vi.ts
+++ b/translations/subsurface_vi.ts
@@ -987,7 +987,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1000,7 +1000,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1008,7 +1008,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1016,7 +1016,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1024,7 +1024,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1037,7 +1037,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1050,7 +1050,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1058,7 +1058,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>
diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts
index f70d9e20b..b395d8859 100644
--- a/translations/subsurface_zh_TW.ts
+++ b/translations/subsurface_zh_TW.ts
@@ -991,7 +991,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1033"/>
         <source>Add cylinder</source>
@@ -1004,7 +1004,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventBookmark</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="67"/>
         <source>Add bookmark</source>
@@ -1012,7 +1012,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventDivemodeSwitch</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="73"/>
         <source>Add dive mode switch to %1</source>
@@ -1020,7 +1020,7 @@
     </message>
 </context>
 <context>
-    <name>Command::AddEventSetpointChange</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="79"/>
         <source>Add set point change</source>
@@ -1028,7 +1028,7 @@
     </message>
 </context>
 <context>
-    <name>Command::EditCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1204"/>
         <source>Edit cylinder</source>
@@ -1041,7 +1041,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveCylinder</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_edit.cpp" line="1154"/>
         <source>Remove cylinder</source>
@@ -1054,7 +1054,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RemoveEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="114"/>
         <source>Remove %1 event</source>
@@ -1062,7 +1062,7 @@
     </message>
 </context>
 <context>
-    <name>Command::RenameEvent</name>
+    <name>Command</name>
     <message>
         <location filename="../commands/command_event.cpp" line="86"/>
         <source>Rename bookmark to %1</source>