diff --git a/plugins/mock/translations/727a4a9a-c187-446f-aadf-f1b2220607d1-de_DE.ts b/plugins/mock/translations/727a4a9a-c187-446f-aadf-f1b2220607d1-de_DE.ts
index c3e1ce02..29936487 100644
--- a/plugins/mock/translations/727a4a9a-c187-446f-aadf-f1b2220607d1-de_DE.ts
+++ b/plugins/mock/translations/727a4a9a-c187-446f-aadf-f1b2220607d1-de_DE.ts
@@ -54,9 +54,17 @@
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>SimplePushButtonHandler</name>
     <message>
-        <location filename="../../../server/main.cpp" line="162"/>
+        <location filename="../../../tests/tools/simplepushbuttonhandler/main.cpp" line="34"/>
+        <source>If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>nymea</name>
+    <message>
+        <location filename="../../../server/main.cpp" line="163"/>
         <source>
 nymea is an open source IoT (Internet of Things) server, 
 which allows to control a lot of different devices from many different 
@@ -68,38 +76,40 @@ for your environment.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../server/main.cpp" line="174"/>
+        <location filename="../../../server/main.cpp" line="175"/>
         <source>Run nymead in the foreground, not as daemon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../server/main.cpp" line="177"/>
+        <location filename="../../../server/main.cpp" line="178"/>
         <source>Debug categories to enable. Prefix with &quot;No&quot; to disable. Warnings from all categories will be printed unless explicitly muted with &quot;NoWarnings&quot;. 
 
 Categories are:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../server/main.cpp" line="194"/>
+        <location filename="../../../server/main.cpp" line="195"/>
         <source>Enables all debug categories. Single debug categories can be disabled again with -d parameter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../server/main.cpp" line="197"/>
+        <location filename="../../../server/main.cpp" line="198"/>
         <source>Specify a log file to write to, if this option is not specified, logs will be printed to the standard output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../server/main.cpp" line="200"/>
-        <location filename="../../../tests/tools/simplepushbuttonhandler/main.cpp" line="33"/>
+        <location filename="../../../server/main.cpp" line="201"/>
         <source>If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../server/main.cpp" line="240"/>
+        <location filename="../../../server/main.cpp" line="241"/>
         <source>No such debug category:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>nymeaserver::DebugServerHandler</name>
     <message>
         <location filename="../../../libnymea-core/debugserverhandler.cpp" line="61"/>
         <location filename="../../../libnymea-core/debugserverhandler.cpp" line="533"/>
diff --git a/plugins/mock/translations/727a4a9a-c187-446f-aadf-f1b2220607d1-en_US.ts b/plugins/mock/translations/727a4a9a-c187-446f-aadf-f1b2220607d1-en_US.ts
index 332cb650..4257ecd5 100644
--- a/plugins/mock/translations/727a4a9a-c187-446f-aadf-f1b2220607d1-en_US.ts
+++ b/plugins/mock/translations/727a4a9a-c187-446f-aadf-f1b2220607d1-en_US.ts
@@ -54,9 +54,17 @@
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>SimplePushButtonHandler</name>
     <message>
-        <location filename="../../../server/main.cpp" line="162"/>
+        <location filename="../../../tests/tools/simplepushbuttonhandler/main.cpp" line="34"/>
+        <source>If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>nymea</name>
+    <message>
+        <location filename="../../../server/main.cpp" line="163"/>
         <source>
 nymea is an open source IoT (Internet of Things) server, 
 which allows to control a lot of different devices from many different 
@@ -68,38 +76,40 @@ for your environment.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../server/main.cpp" line="174"/>
+        <location filename="../../../server/main.cpp" line="175"/>
         <source>Run nymead in the foreground, not as daemon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../server/main.cpp" line="177"/>
+        <location filename="../../../server/main.cpp" line="178"/>
         <source>Debug categories to enable. Prefix with &quot;No&quot; to disable. Warnings from all categories will be printed unless explicitly muted with &quot;NoWarnings&quot;. 
 
 Categories are:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../server/main.cpp" line="194"/>
+        <location filename="../../../server/main.cpp" line="195"/>
         <source>Enables all debug categories. Single debug categories can be disabled again with -d parameter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../server/main.cpp" line="197"/>
+        <location filename="../../../server/main.cpp" line="198"/>
         <source>Specify a log file to write to, if this option is not specified, logs will be printed to the standard output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../server/main.cpp" line="200"/>
-        <location filename="../../../tests/tools/simplepushbuttonhandler/main.cpp" line="33"/>
+        <location filename="../../../server/main.cpp" line="201"/>
         <source>If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../server/main.cpp" line="240"/>
+        <location filename="../../../server/main.cpp" line="241"/>
         <source>No such debug category:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>nymeaserver::DebugServerHandler</name>
     <message>
         <location filename="../../../libnymea-core/debugserverhandler.cpp" line="61"/>
         <location filename="../../../libnymea-core/debugserverhandler.cpp" line="533"/>
diff --git a/translations/nymead-de_DE.ts b/translations/nymead-de_DE.ts
index 14283aff..103b552a 100644
--- a/translations/nymead-de_DE.ts
+++ b/translations/nymead-de_DE.ts
@@ -54,9 +54,17 @@
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>SimplePushButtonHandler</name>
     <message>
-        <location filename="../server/main.cpp" line="162"/>
+        <location filename="../tests/tools/simplepushbuttonhandler/main.cpp" line="34"/>
+        <source>If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</source>
+        <translation type="unfinished">Falls angegeben, werden alle D-Bus Schnittstellen auf dem Sitzungs-Bus anstatt auf dem System-Bus zur verfügung gestellt.</translation>
+    </message>
+</context>
+<context>
+    <name>nymea</name>
+    <message>
+        <location filename="../server/main.cpp" line="163"/>
         <source>
 nymea is an open source IoT (Internet of Things) server, 
 which allows to control a lot of different devices from many different 
@@ -68,39 +76,41 @@ for your environment.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="174"/>
+        <location filename="../server/main.cpp" line="175"/>
         <source>Run nymead in the foreground, not as daemon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="177"/>
+        <location filename="../server/main.cpp" line="178"/>
         <source>Debug categories to enable. Prefix with &quot;No&quot; to disable. Warnings from all categories will be printed unless explicitly muted with &quot;NoWarnings&quot;. 
 
 Categories are:</source>
-        <translation>Zu aktivierende Debug-Kategorien. Kategorien mit dem Präfix &quot;No&quot; werden deaktiviert. Warnungen werden von allen Kategorien angezeigt außer sie wurden explizit mit dem Prefix &quot;NoWarnings&quot; deaktiviert.
+        <translation type="unfinished">Zu aktivierende Debug-Kategorien. Kategorien mit dem Präfix &quot;No&quot; werden deaktiviert. Warnungen werden von allen Kategorien angezeigt außer sie wurden explizit mit dem Prefix &quot;NoWarnings&quot; deaktiviert.
 Es gibt folgende Kategorien:</translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="194"/>
+        <location filename="../server/main.cpp" line="195"/>
         <source>Enables all debug categories. Single debug categories can be disabled again with -d parameter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="197"/>
+        <location filename="../server/main.cpp" line="198"/>
         <source>Specify a log file to write to, if this option is not specified, logs will be printed to the standard output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="200"/>
-        <location filename="../tests/tools/simplepushbuttonhandler/main.cpp" line="33"/>
+        <location filename="../server/main.cpp" line="201"/>
         <source>If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</source>
-        <translation>Falls angegeben, werden alle D-Bus Schnittstellen auf dem Sitzungs-Bus anstatt auf dem System-Bus zur verfügung gestellt.</translation>
+        <translation type="unfinished">Falls angegeben, werden alle D-Bus Schnittstellen auf dem Sitzungs-Bus anstatt auf dem System-Bus zur verfügung gestellt.</translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="240"/>
+        <location filename="../server/main.cpp" line="241"/>
         <source>No such debug category:</source>
-        <translation>Diese Debug-Kategorie existiert nicht:</translation>
+        <translation type="unfinished">Diese Debug-Kategorie existiert nicht:</translation>
     </message>
+</context>
+<context>
+    <name>nymeaserver::DebugServerHandler</name>
     <message>
         <location filename="../libnymea-core/debugserverhandler.cpp" line="61"/>
         <location filename="../libnymea-core/debugserverhandler.cpp" line="533"/>
diff --git a/translations/nymead-en_US.ts b/translations/nymead-en_US.ts
index c60e9b67..d07ad863 100644
--- a/translations/nymead-en_US.ts
+++ b/translations/nymead-en_US.ts
@@ -54,9 +54,17 @@
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>SimplePushButtonHandler</name>
     <message>
-        <location filename="../server/main.cpp" line="162"/>
+        <location filename="../tests/tools/simplepushbuttonhandler/main.cpp" line="34"/>
+        <source>If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</source>
+        <translation type="unfinished">If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</translation>
+    </message>
+</context>
+<context>
+    <name>nymea</name>
+    <message>
+        <location filename="../server/main.cpp" line="163"/>
         <source>
 nymea is an open source IoT (Internet of Things) server, 
 which allows to control a lot of different devices from many different 
@@ -68,40 +76,42 @@ for your environment.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="174"/>
+        <location filename="../server/main.cpp" line="175"/>
         <source>Run nymead in the foreground, not as daemon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="177"/>
+        <location filename="../server/main.cpp" line="178"/>
         <source>Debug categories to enable. Prefix with &quot;No&quot; to disable. Warnings from all categories will be printed unless explicitly muted with &quot;NoWarnings&quot;. 
 
 Categories are:</source>
-        <translation>Debug categories to enable. Prefix with &quot;No&quot; to disable. Warnings from all categories will be printed unless explicitly muted with &quot;NoWarnings&quot;. 
+        <translation type="unfinished">Debug categories to enable. Prefix with &quot;No&quot; to disable. Warnings from all categories will be printed unless explicitly muted with &quot;NoWarnings&quot;. 
 
 Categories are:</translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="194"/>
+        <location filename="../server/main.cpp" line="195"/>
         <source>Enables all debug categories. Single debug categories can be disabled again with -d parameter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="197"/>
+        <location filename="../server/main.cpp" line="198"/>
         <source>Specify a log file to write to, if this option is not specified, logs will be printed to the standard output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="200"/>
-        <location filename="../tests/tools/simplepushbuttonhandler/main.cpp" line="33"/>
+        <location filename="../server/main.cpp" line="201"/>
         <source>If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</source>
-        <translation>If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</translation>
+        <translation type="unfinished">If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="240"/>
+        <location filename="../server/main.cpp" line="241"/>
         <source>No such debug category:</source>
-        <translation>No such debug category:</translation>
+        <translation type="unfinished">No such debug category:</translation>
     </message>
+</context>
+<context>
+    <name>nymeaserver::DebugServerHandler</name>
     <message>
         <location filename="../libnymea-core/debugserverhandler.cpp" line="61"/>
         <location filename="../libnymea-core/debugserverhandler.cpp" line="533"/>
diff --git a/translations/nymead-it.ts b/translations/nymead-it.ts
index 3b22e2b6..4598762b 100644
--- a/translations/nymead-it.ts
+++ b/translations/nymead-it.ts
@@ -54,9 +54,17 @@
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>SimplePushButtonHandler</name>
     <message>
-        <location filename="../server/main.cpp" line="162"/>
+        <location filename="../tests/tools/simplepushbuttonhandler/main.cpp" line="34"/>
+        <source>If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>nymea</name>
+    <message>
+        <location filename="../server/main.cpp" line="163"/>
         <source>
 nymea is an open source IoT (Internet of Things) server, 
 which allows to control a lot of different devices from many different 
@@ -68,38 +76,40 @@ for your environment.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="174"/>
+        <location filename="../server/main.cpp" line="175"/>
         <source>Run nymead in the foreground, not as daemon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="177"/>
+        <location filename="../server/main.cpp" line="178"/>
         <source>Debug categories to enable. Prefix with &quot;No&quot; to disable. Warnings from all categories will be printed unless explicitly muted with &quot;NoWarnings&quot;. 
 
 Categories are:</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="194"/>
+        <location filename="../server/main.cpp" line="195"/>
         <source>Enables all debug categories. Single debug categories can be disabled again with -d parameter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="197"/>
+        <location filename="../server/main.cpp" line="198"/>
         <source>Specify a log file to write to, if this option is not specified, logs will be printed to the standard output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="200"/>
-        <location filename="../tests/tools/simplepushbuttonhandler/main.cpp" line="33"/>
+        <location filename="../server/main.cpp" line="201"/>
         <source>If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../server/main.cpp" line="240"/>
+        <location filename="../server/main.cpp" line="241"/>
         <source>No such debug category:</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>nymeaserver::DebugServerHandler</name>
     <message>
         <location filename="../libnymea-core/debugserverhandler.cpp" line="61"/>
         <location filename="../libnymea-core/debugserverhandler.cpp" line="533"/>