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 8b82f386..a2433db3 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
@@ -10,363 +10,51 @@
     </message>
 </context>
 <context>
-    <name>MockDevice</name>
+    <name>main</name>
     <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="100"/>
-        <source>guh</source>
-        <extracomment>The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6)</extracomment>
-        <translation>guh</translation>
+        <location filename="../../../server/main.cpp" line="161"/>
+        <source>
+guh ( /[guːh]/ ) is an open source IoT (Internet of Things) server, 
+which allows to control a lot of different devices from many different 
+manufacturers. With the powerful rule engine you are able to connect any 
+device available in the system and create individual scenes and behaviors 
+for your environment.
+
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="103"/>
-        <source>Mock Device</source>
-        <extracomment>The name of the DeviceClass (753f0d32-0468-4d08-82ed-1964aab03298)</extracomment>
-        <translation>Mock Gerät</translation>
+        <location filename="../../../server/main.cpp" line="173"/>
+        <source>Run guhd in the foreground, not as daemon.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="106"/>
-        <source>http port</source>
-        <extracomment>The name of the paramType (d4f06047-125e-4479-9810-b54c189917f5) of Mock Device</extracomment>
-        <translation>HTTP Port</translation>
+        <location filename="../../../server/main.cpp" line="176"/>
+        <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="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="142"/>
-        <source>Mock Action 3 (async)</source>
-        <extracomment>The name of the ActionType fbae06d3-7666-483e-a39e-ec50fe89054e of deviceClass Mock Device</extracomment>
-        <translation>Mock Aktion 3 (async)</translation>
+        <location filename="../../../server/main.cpp" line="193"/>
+        <source>Enables all debug categories. This parameter overrides all debug category parameters.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="145"/>
-        <source>Mock Action 4 (broken)</source>
-        <extracomment>The name of the ActionType df3cf33d-26d5-4577-9132-9823bd33fad0 of deviceClass Mock Device</extracomment>
-        <translation>Mock Aktion 4 (kaputt)</translation>
+        <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="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="148"/>
-        <source>Mock Action 5 (async, broken)</source>
-        <extracomment>The name of the ActionType bfe89a1d-3497-4121-8318-e77c37537219 of deviceClass Mock Device</extracomment>
-        <translation>Mock Aktion 5 (async, kaputt)</translation>
+        <location filename="../../../server/main.cpp" line="201"/>
+        <location filename="../../../tests/tools/simplepushbuttonhandler/main.cpp" line="33"/>
+        <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="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="154"/>
-        <source>Mock Device (Auto created)</source>
-        <extracomment>The name of the DeviceClass (ab4257b3-7548-47ee-9bd4-7dc3004fd197)</extracomment>
-        <translation>Mock Gerät (Auto erstellt)</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="166"/>
-        <source>Mock Device (Push Button)</source>
-        <extracomment>The name of the DeviceClass (9e03144c-e436-4eea-82d9-ccb33ef778db)</extracomment>
-        <translation>Mock Gerät (Drückknopf)</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="163"/>
-        <source>Wait 3 second before you continue, the push button will be pressed automatically.</source>
-        <extracomment>The pairing info of deviceClass Mock Device (Push Button)</extracomment>
-        <translation>Warte 3 Sekunden bevor du fortfährst, the Knopf wird automatisch gerückt.</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="94"/>
-        <source>configParamInt</source>
-        <extracomment>The name of the paramType (e1f72121-a426-45e2-b475-8262b5cdf103) of Mock Devices</extracomment>
-        <translation>configParamInt</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="97"/>
-        <source>configParamBool</source>
-        <extracomment>The name of the paramType (c75723b6-ea4f-4982-9751-6c5e39c88145) of Mock Devices</extracomment>
-        <translation>configParamBool</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="109"/>
-        <source>async</source>
-        <extracomment>The name of the paramType (f2977061-4dd0-4ef5-85aa-3b7134743be3) of Mock Device</extracomment>
-        <translation>async</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="112"/>
-        <source>broken</source>
-        <extracomment>The name of the paramType (ae8f8901-f2c1-42a5-8111-6d2fc8e4c1e4) of Mock Device</extracomment>
-        <translation>kaputt</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="115"/>
-        <source>resultCount</source>
-        <extracomment>The name of the paramType (d222adb4-2f9c-4c3f-8655-76400d0fb6ce) of Mock Device</extracomment>
-        <translation>Resultat Anzahl</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="118"/>
-        <source>Dummy int state changed</source>
-        <extracomment>The name of the autocreated EventType (80baec19-54de-4948-ac46-31eabfaceb83)</extracomment>
-        <translation>Int Zustand verändert</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="121"/>
-        <source>Dummy int state</source>
-        <extracomment>The name of the ParamType of StateType (80baec19-54de-4948-ac46-31eabfaceb83) of DeviceClass Mock Device</extracomment>
-        <translation>Dummy Int Zustand</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="124"/>
-        <source>Dummy bool state changed</source>
-        <extracomment>The name of the autocreated EventType (9dd6a97c-dfd1-43dc-acbd-367932742310)</extracomment>
-        <translation>Bool Zustand verändert</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="127"/>
-        <source>Dummy bool state</source>
-        <extracomment>The name of the ParamType of StateType (9dd6a97c-dfd1-43dc-acbd-367932742310) of DeviceClass Mock Device</extracomment>
-        <translation>Dummy Bool Zustand</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="130"/>
-        <source>Mock Action 1 (with params)</source>
-        <extracomment>The name of the ActionType dea0f4e1-65e3-4981-8eaa-2701c53a9185 of deviceClass Mock Device</extracomment>
-        <translation>Mock Aktion 1 (Mit Parametern)</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="133"/>
-        <source>mockActionParam1</source>
-        <extracomment>The name of the paramType (a2d3a256-a551-4712-a65b-ecd5a436a1cb) of Mock Device</extracomment>
-        <translation>mockActionParam1</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="136"/>
-        <source>mockActionParam2</source>
-        <extracomment>The name of the paramType (304a4899-18be-4e3b-94f4-d03be52f3233) of Mock Device</extracomment>
-        <translation>mockActionParam2</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="139"/>
-        <source>Mock Action 2 (without params)</source>
-        <extracomment>The name of the ActionType defd3ed6-1a0d-400b-8879-a0202cf39935 of deviceClass Mock Device</extracomment>
-        <translation>Mock Aktion (ohne Parameter</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="151"/>
-        <source>mockParamInt</source>
-        <extracomment>The name of the paramType (0550e16d-60b9-4ba5-83f4-4d3cee656121) of Mock Device</extracomment>
-        <translation>mockParamInt</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="157"/>
-        <source>Mock Event 1</source>
-        <extracomment>The name of the EventType 45bf3752-0fc6-46b9-89fd-ffd878b5b22b of deviceClass Mock Device (Auto created)</extracomment>
-        <translation>Mock Event 1</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="160"/>
-        <source>Mock Event 2</source>
-        <extracomment>The name of the EventType 863d5920-b1cf-4eb9-88bd-8f7b8583b1cf of deviceClass Mock Device (Auto created)</extracomment>
-        <translation>Mock Event 2</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="169"/>
-        <source>color changed</source>
-        <extracomment>The name of the autocreated EventType (20dc7c22-c50e-42db-837c-2bbced939f8e)</extracomment>
-        <translation>Farbe geändert</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="172"/>
-        <source>color</source>
-        <extracomment>The name of the ParamType of StateType (20dc7c22-c50e-42db-837c-2bbced939f8e) of DeviceClass Mock Device (Push Button)</extracomment>
-        <translation>Farbe</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="175"/>
-        <source>Set color</source>
-        <extracomment>The name of the autocreated ActionType (20dc7c22-c50e-42db-837c-2bbced939f8e)</extracomment>
-        <translation>Setze Farbe</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="178"/>
-        <source>percentage changed</source>
-        <extracomment>The name of the autocreated EventType (72981c04-267a-4ba0-a59e-9921d2f3af9c)</extracomment>
-        <translation>Prozent gändert</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="181"/>
-        <source>percentage</source>
-        <extracomment>The name of the ParamType of StateType (72981c04-267a-4ba0-a59e-9921d2f3af9c) of DeviceClass Mock Device (Push Button)</extracomment>
-        <translation>Prozent</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="184"/>
-        <source>Set percentage</source>
-        <extracomment>The name of the autocreated ActionType (72981c04-267a-4ba0-a59e-9921d2f3af9c)</extracomment>
-        <translation>Setze Prozentwert</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="187"/>
-        <source>allowed values changed</source>
-        <extracomment>The name of the autocreated EventType (05f63f9c-f61e-4dcf-ad55-3f13fde2765b)</extracomment>
-        <translation>Erlaubter Wert geändert</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="190"/>
-        <source>allowed values</source>
-        <extracomment>The name of the ParamType of StateType (05f63f9c-f61e-4dcf-ad55-3f13fde2765b) of DeviceClass Mock Device (Push Button)</extracomment>
-        <translation>Erlaubte Werte</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="193"/>
-        <source>Set allowed values</source>
-        <extracomment>The name of the autocreated ActionType (05f63f9c-f61e-4dcf-ad55-3f13fde2765b)</extracomment>
-        <translation>Setze erlaubten Wert</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="196"/>
-        <source>double value changed</source>
-        <extracomment>The name of the autocreated EventType (53cd7c55-49b7-441b-b970-9048f20f0e2c)</extracomment>
-        <translation>Double Wert geändert</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="199"/>
-        <source>double value</source>
-        <extracomment>The name of the ParamType of StateType (53cd7c55-49b7-441b-b970-9048f20f0e2c) of DeviceClass Mock Device (Push Button)</extracomment>
-        <translation>Double Wert</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="202"/>
-        <source>Set double value</source>
-        <extracomment>The name of the autocreated ActionType (53cd7c55-49b7-441b-b970-9048f20f0e2c)</extracomment>
-        <translation>Setze double Wert</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="211"/>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="235"/>
-        <source>Set bool value</source>
-        <extracomment>The name of the autocreated ActionType (e680f7a4-b39e-46da-be41-fa3170fe3768)
-----------
-The name of the autocreated ActionType (d24ede5f-4064-4898-bb84-cfb533b1fbc0)</extracomment>
-        <translation>Setze boll Wert</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="214"/>
-        <source>Timeout action</source>
-        <extracomment>The name of the ActionType 54646e7c-bc54-4895-81a2-590d72d120f9 of deviceClass Mock Device (Push Button)</extracomment>
-        <translation>Timeout Aktion</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="220"/>
-        <source>Mock Device (Display Pin)</source>
-        <extracomment>The name of the DeviceClass (296f1fd4-e893-46b2-8a42-50d1bceb8730)</extracomment>
-        <translation>Mock Gerät (Pin anzeigen)</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="205"/>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="229"/>
-        <source>bool value changed</source>
-        <extracomment>The name of the autocreated EventType (e680f7a4-b39e-46da-be41-fa3170fe3768)
-----------
-The name of the autocreated EventType (d24ede5f-4064-4898-bb84-cfb533b1fbc0)</extracomment>
-        <translation>Bool Wert geändert</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="208"/>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="232"/>
-        <source>bool value</source>
-        <extracomment>The name of the ParamType of StateType (e680f7a4-b39e-46da-be41-fa3170fe3768) of DeviceClass Mock Device (Push Button)
-----------
-The name of the ParamType of StateType (d24ede5f-4064-4898-bb84-cfb533b1fbc0) of DeviceClass Mock Device (Parent)</extracomment>
-        <translation>Bool Wert</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="247"/>
-        <source>Text line</source>
-        <extracomment>The name of the paramType (e6acf0c7-4b8e-4296-ac62-855d20deb816) of Mock Device (InputTypes)</extracomment>
-        <translation>Textzeile</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="250"/>
-        <source>Text area</source>
-        <extracomment>The name of the paramType (716f0994-bc01-42b0-b64d-59236f7320d2) of Mock Device (InputTypes)</extracomment>
-        <translation>Textfeld</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="253"/>
-        <source>Password text</source>
-        <extracomment>The name of the paramType (e5c0d14b-c9f1-4aca-a56e-85bfa6977150) of Mock Device (InputTypes)</extracomment>
-        <translation>Passwort Text</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="256"/>
-        <source>Search text</source>
-        <extracomment>The name of the paramType (22add8c9-ee4f-43ad-8931-58e999313ac3) of Mock Device (InputTypes)</extracomment>
-        <translation>Suchtext</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="259"/>
-        <source>Mail address</source>
-        <extracomment>The name of the paramType (a8494faf-3a0f-4cf3-84b7-4b39148a838d) of Mock Device (InputTypes)</extracomment>
-        <translation>Mail Adresse</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="262"/>
-        <source>IPv4 address</source>
-        <extracomment>The name of the paramType (9e5f86a0-4bb3-4892-bff8-3fc4032af6e2) of Mock Device (InputTypes)</extracomment>
-        <translation>IPv4 Adresse</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="265"/>
-        <source>IPv6 address</source>
-        <extracomment>The name of the paramType (43bf3832-dd48-4090-a836-656e8b60216e) of Mock Device (InputTypes)</extracomment>
-        <translation>IPv6 Adresse</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="268"/>
-        <source>URL</source>
-        <extracomment>The name of the paramType (fa67229f-fcef-496f-b671-59a4b48f3ab5) of Mock Device (InputTypes)</extracomment>
-        <translation>URL</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="271"/>
-        <source>Mac address</source>
-        <extracomment>The name of the paramType (e93db587-7919-48f3-8c88-1651de63c765) of Mock Device (InputTypes)</extracomment>
-        <translation>Mac Adresse</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="217"/>
-        <source>Please enter the secret which normaly will be displayed on the device. For the mockdevice the pin is 243681.</source>
-        <extracomment>The pairing info of deviceClass Mock Device (Display Pin)</extracomment>
-        <translation>Bitte geben sie den Pincode ein der normalerweise auf dem Gerät angezeit werden würde. In diesem fall lautet der Pincode 243681.</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="91"/>
-        <source>Mock Devices</source>
-        <extracomment>The name of the plugin Mock Devices (727a4a9a-c187-446f-aadf-f1b2220607d1)</extracomment>
-        <translation>Mock Gerät</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="223"/>
-        <source>pin</source>
-        <extracomment>The name of the paramType (da820e07-22dc-4173-9c07-2f49a4e265f9) of Mock Device (Display Pin)</extracomment>
-        <translation>Pin</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="226"/>
-        <source>Mock Device (Parent)</source>
-        <extracomment>The name of the DeviceClass (a71fbde9-9a38-4bf8-beab-c8aade2608ba)</extracomment>
-        <translation>Mock Gerät (Elternteil)</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="238"/>
-        <source>Mock Device (Child)</source>
-        <extracomment>The name of the DeviceClass (40893c9f-bc47-40c1-8bf7-b390c7c1b4fc)</extracomment>
-        <translation>Mock Gerät (Kind)</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="241"/>
-        <source>parent uuid</source>
-        <extracomment>The name of the paramType (104b5288-404e-42d3-bf38-e40682e75681) of Mock Device (Child)</extracomment>
-        <translation>Elternteil Uuid</translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="244"/>
-        <source>Mock Device (InputTypes)</source>
-        <extracomment>The name of the DeviceClass (515ffdf1-55e5-498d-9abc-4e2fe768f3a9)</extracomment>
-        <translation>Mock Gerät (Eingabemethoden)</translation>
+        <location filename="../../../server/main.cpp" line="238"/>
+        <source>No such debug category:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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 ed068c24..c6feaa91 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
@@ -10,362 +10,50 @@
     </message>
 </context>
 <context>
-    <name>MockDevice</name>
+    <name>main</name>
     <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="100"/>
-        <source>guh</source>
-        <extracomment>The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6)</extracomment>
+        <location filename="../../../server/main.cpp" line="161"/>
+        <source>
+guh ( /[guːh]/ ) is an open source IoT (Internet of Things) server, 
+which allows to control a lot of different devices from many different 
+manufacturers. With the powerful rule engine you are able to connect any 
+device available in the system and create individual scenes and behaviors 
+for your environment.
+
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="103"/>
-        <source>Mock Device</source>
-        <extracomment>The name of the DeviceClass (753f0d32-0468-4d08-82ed-1964aab03298)</extracomment>
+        <location filename="../../../server/main.cpp" line="173"/>
+        <source>Run guhd in the foreground, not as daemon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="106"/>
-        <source>http port</source>
-        <extracomment>The name of the paramType (d4f06047-125e-4479-9810-b54c189917f5) of Mock Device</extracomment>
+        <location filename="../../../server/main.cpp" line="176"/>
+        <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="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="142"/>
-        <source>Mock Action 3 (async)</source>
-        <extracomment>The name of the ActionType fbae06d3-7666-483e-a39e-ec50fe89054e of deviceClass Mock Device</extracomment>
+        <location filename="../../../server/main.cpp" line="193"/>
+        <source>Enables all debug categories. This parameter overrides all debug category parameters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="145"/>
-        <source>Mock Action 4 (broken)</source>
-        <extracomment>The name of the ActionType df3cf33d-26d5-4577-9132-9823bd33fad0 of deviceClass Mock Device</extracomment>
+        <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="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="148"/>
-        <source>Mock Action 5 (async, broken)</source>
-        <extracomment>The name of the ActionType bfe89a1d-3497-4121-8318-e77c37537219 of deviceClass Mock Device</extracomment>
+        <location filename="../../../server/main.cpp" line="201"/>
+        <location filename="../../../tests/tools/simplepushbuttonhandler/main.cpp" line="33"/>
+        <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="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="154"/>
-        <source>Mock Device (Auto created)</source>
-        <extracomment>The name of the DeviceClass (ab4257b3-7548-47ee-9bd4-7dc3004fd197)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="166"/>
-        <source>Mock Device (Push Button)</source>
-        <extracomment>The name of the DeviceClass (9e03144c-e436-4eea-82d9-ccb33ef778db)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="163"/>
-        <source>Wait 3 second before you continue, the push button will be pressed automatically.</source>
-        <extracomment>The pairing info of deviceClass Mock Device (Push Button)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="94"/>
-        <source>configParamInt</source>
-        <extracomment>The name of the paramType (e1f72121-a426-45e2-b475-8262b5cdf103) of Mock Devices</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="97"/>
-        <source>configParamBool</source>
-        <extracomment>The name of the paramType (c75723b6-ea4f-4982-9751-6c5e39c88145) of Mock Devices</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="109"/>
-        <source>async</source>
-        <extracomment>The name of the paramType (f2977061-4dd0-4ef5-85aa-3b7134743be3) of Mock Device</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="112"/>
-        <source>broken</source>
-        <extracomment>The name of the paramType (ae8f8901-f2c1-42a5-8111-6d2fc8e4c1e4) of Mock Device</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="115"/>
-        <source>resultCount</source>
-        <extracomment>The name of the paramType (d222adb4-2f9c-4c3f-8655-76400d0fb6ce) of Mock Device</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="118"/>
-        <source>Dummy int state changed</source>
-        <extracomment>The name of the autocreated EventType (80baec19-54de-4948-ac46-31eabfaceb83)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="121"/>
-        <source>Dummy int state</source>
-        <extracomment>The name of the ParamType of StateType (80baec19-54de-4948-ac46-31eabfaceb83) of DeviceClass Mock Device</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="124"/>
-        <source>Dummy bool state changed</source>
-        <extracomment>The name of the autocreated EventType (9dd6a97c-dfd1-43dc-acbd-367932742310)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="127"/>
-        <source>Dummy bool state</source>
-        <extracomment>The name of the ParamType of StateType (9dd6a97c-dfd1-43dc-acbd-367932742310) of DeviceClass Mock Device</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="130"/>
-        <source>Mock Action 1 (with params)</source>
-        <extracomment>The name of the ActionType dea0f4e1-65e3-4981-8eaa-2701c53a9185 of deviceClass Mock Device</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="133"/>
-        <source>mockActionParam1</source>
-        <extracomment>The name of the paramType (a2d3a256-a551-4712-a65b-ecd5a436a1cb) of Mock Device</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="136"/>
-        <source>mockActionParam2</source>
-        <extracomment>The name of the paramType (304a4899-18be-4e3b-94f4-d03be52f3233) of Mock Device</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="139"/>
-        <source>Mock Action 2 (without params)</source>
-        <extracomment>The name of the ActionType defd3ed6-1a0d-400b-8879-a0202cf39935 of deviceClass Mock Device</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="151"/>
-        <source>mockParamInt</source>
-        <extracomment>The name of the paramType (0550e16d-60b9-4ba5-83f4-4d3cee656121) of Mock Device</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="157"/>
-        <source>Mock Event 1</source>
-        <extracomment>The name of the EventType 45bf3752-0fc6-46b9-89fd-ffd878b5b22b of deviceClass Mock Device (Auto created)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="160"/>
-        <source>Mock Event 2</source>
-        <extracomment>The name of the EventType 863d5920-b1cf-4eb9-88bd-8f7b8583b1cf of deviceClass Mock Device (Auto created)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="169"/>
-        <source>color changed</source>
-        <extracomment>The name of the autocreated EventType (20dc7c22-c50e-42db-837c-2bbced939f8e)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="172"/>
-        <source>color</source>
-        <extracomment>The name of the ParamType of StateType (20dc7c22-c50e-42db-837c-2bbced939f8e) of DeviceClass Mock Device (Push Button)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="175"/>
-        <source>Set color</source>
-        <extracomment>The name of the autocreated ActionType (20dc7c22-c50e-42db-837c-2bbced939f8e)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="178"/>
-        <source>percentage changed</source>
-        <extracomment>The name of the autocreated EventType (72981c04-267a-4ba0-a59e-9921d2f3af9c)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="181"/>
-        <source>percentage</source>
-        <extracomment>The name of the ParamType of StateType (72981c04-267a-4ba0-a59e-9921d2f3af9c) of DeviceClass Mock Device (Push Button)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="184"/>
-        <source>Set percentage</source>
-        <extracomment>The name of the autocreated ActionType (72981c04-267a-4ba0-a59e-9921d2f3af9c)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="187"/>
-        <source>allowed values changed</source>
-        <extracomment>The name of the autocreated EventType (05f63f9c-f61e-4dcf-ad55-3f13fde2765b)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="190"/>
-        <source>allowed values</source>
-        <extracomment>The name of the ParamType of StateType (05f63f9c-f61e-4dcf-ad55-3f13fde2765b) of DeviceClass Mock Device (Push Button)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="193"/>
-        <source>Set allowed values</source>
-        <extracomment>The name of the autocreated ActionType (05f63f9c-f61e-4dcf-ad55-3f13fde2765b)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="196"/>
-        <source>double value changed</source>
-        <extracomment>The name of the autocreated EventType (53cd7c55-49b7-441b-b970-9048f20f0e2c)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="199"/>
-        <source>double value</source>
-        <extracomment>The name of the ParamType of StateType (53cd7c55-49b7-441b-b970-9048f20f0e2c) of DeviceClass Mock Device (Push Button)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="202"/>
-        <source>Set double value</source>
-        <extracomment>The name of the autocreated ActionType (53cd7c55-49b7-441b-b970-9048f20f0e2c)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="211"/>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="235"/>
-        <source>Set bool value</source>
-        <extracomment>The name of the autocreated ActionType (e680f7a4-b39e-46da-be41-fa3170fe3768)
-----------
-The name of the autocreated ActionType (d24ede5f-4064-4898-bb84-cfb533b1fbc0)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="214"/>
-        <source>Timeout action</source>
-        <extracomment>The name of the ActionType 54646e7c-bc54-4895-81a2-590d72d120f9 of deviceClass Mock Device (Push Button)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="220"/>
-        <source>Mock Device (Display Pin)</source>
-        <extracomment>The name of the DeviceClass (296f1fd4-e893-46b2-8a42-50d1bceb8730)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="205"/>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="229"/>
-        <source>bool value changed</source>
-        <extracomment>The name of the autocreated EventType (e680f7a4-b39e-46da-be41-fa3170fe3768)
-----------
-The name of the autocreated EventType (d24ede5f-4064-4898-bb84-cfb533b1fbc0)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="208"/>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="232"/>
-        <source>bool value</source>
-        <extracomment>The name of the ParamType of StateType (e680f7a4-b39e-46da-be41-fa3170fe3768) of DeviceClass Mock Device (Push Button)
-----------
-The name of the ParamType of StateType (d24ede5f-4064-4898-bb84-cfb533b1fbc0) of DeviceClass Mock Device (Parent)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="247"/>
-        <source>Text line</source>
-        <extracomment>The name of the paramType (e6acf0c7-4b8e-4296-ac62-855d20deb816) of Mock Device (InputTypes)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="250"/>
-        <source>Text area</source>
-        <extracomment>The name of the paramType (716f0994-bc01-42b0-b64d-59236f7320d2) of Mock Device (InputTypes)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="253"/>
-        <source>Password text</source>
-        <extracomment>The name of the paramType (e5c0d14b-c9f1-4aca-a56e-85bfa6977150) of Mock Device (InputTypes)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="256"/>
-        <source>Search text</source>
-        <extracomment>The name of the paramType (22add8c9-ee4f-43ad-8931-58e999313ac3) of Mock Device (InputTypes)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="259"/>
-        <source>Mail address</source>
-        <extracomment>The name of the paramType (a8494faf-3a0f-4cf3-84b7-4b39148a838d) of Mock Device (InputTypes)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="262"/>
-        <source>IPv4 address</source>
-        <extracomment>The name of the paramType (9e5f86a0-4bb3-4892-bff8-3fc4032af6e2) of Mock Device (InputTypes)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="265"/>
-        <source>IPv6 address</source>
-        <extracomment>The name of the paramType (43bf3832-dd48-4090-a836-656e8b60216e) of Mock Device (InputTypes)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="268"/>
-        <source>URL</source>
-        <extracomment>The name of the paramType (fa67229f-fcef-496f-b671-59a4b48f3ab5) of Mock Device (InputTypes)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="271"/>
-        <source>Mac address</source>
-        <extracomment>The name of the paramType (e93db587-7919-48f3-8c88-1651de63c765) of Mock Device (InputTypes)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="217"/>
-        <source>Please enter the secret which normaly will be displayed on the device. For the mockdevice the pin is 243681.</source>
-        <extracomment>The pairing info of deviceClass Mock Device (Display Pin)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="91"/>
-        <source>Mock Devices</source>
-        <extracomment>The name of the plugin Mock Devices (727a4a9a-c187-446f-aadf-f1b2220607d1)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="223"/>
-        <source>pin</source>
-        <extracomment>The name of the paramType (da820e07-22dc-4173-9c07-2f49a4e265f9) of Mock Device (Display Pin)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="226"/>
-        <source>Mock Device (Parent)</source>
-        <extracomment>The name of the DeviceClass (a71fbde9-9a38-4bf8-beab-c8aade2608ba)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="238"/>
-        <source>Mock Device (Child)</source>
-        <extracomment>The name of the DeviceClass (40893c9f-bc47-40c1-8bf7-b390c7c1b4fc)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="241"/>
-        <source>parent uuid</source>
-        <extracomment>The name of the paramType (104b5288-404e-42d3-bf38-e40682e75681) of Mock Device (Child)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../../build-guh-Desktop-Debug/plugins/mock/plugininfo.h" line="244"/>
-        <source>Mock Device (InputTypes)</source>
-        <extracomment>The name of the DeviceClass (515ffdf1-55e5-498d-9abc-4e2fe768f3a9)</extracomment>
+        <location filename="../../../server/main.cpp" line="238"/>
+        <source>No such debug category:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/guhd-af.ts b/translations/guhd-af.ts
index eb1cb068..6f795c45 100644
--- a/translations/guhd-af.ts
+++ b/translations/guhd-af.ts
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="af">
+<context>
+    <name>DevicePluginMock</name>
+    <message>
+        <location filename="../plugins/mock/devicepluginmock.cpp" line="214"/>
+        <source>Display pin!! The pin is 243681</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>main</name>
     <message>
@@ -39,6 +47,7 @@ Categories are:</source>
     </message>
     <message>
         <location filename="../server/main.cpp" line="201"/>
+        <location filename="../tests/tools/simplepushbuttonhandler/main.cpp" line="33"/>
         <source>If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</source>
         <translation></translation>
     </message>
diff --git a/translations/guhd-de_DE.ts b/translations/guhd-de_DE.ts
index bfd379d4..b0971008 100644
--- a/translations/guhd-de_DE.ts
+++ b/translations/guhd-de_DE.ts
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="de_DE">
+<context>
+    <name>DevicePluginMock</name>
+    <message>
+        <location filename="../plugins/mock/devicepluginmock.cpp" line="214"/>
+        <source>Display pin!! The pin is 243681</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>main</name>
     <message>
@@ -47,6 +55,7 @@ Es gibt folgende Kategorien:</translation>
     </message>
     <message>
         <location filename="../server/main.cpp" line="201"/>
+        <location filename="../tests/tools/simplepushbuttonhandler/main.cpp" line="33"/>
         <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>
     </message>
diff --git a/translations/guhd-en_US.ts b/translations/guhd-en_US.ts
index a8542204..fe28f4e9 100644
--- a/translations/guhd-en_US.ts
+++ b/translations/guhd-en_US.ts
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="en_US">
+<context>
+    <name>DevicePluginMock</name>
+    <message>
+        <location filename="../plugins/mock/devicepluginmock.cpp" line="214"/>
+        <source>Display pin!! The pin is 243681</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>main</name>
     <message>
@@ -48,6 +56,7 @@ Categories are:</translation>
     </message>
     <message>
         <location filename="../server/main.cpp" line="201"/>
+        <location filename="../tests/tools/simplepushbuttonhandler/main.cpp" line="33"/>
         <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>
     </message>
diff --git a/translations/guhd-it.ts b/translations/guhd-it.ts
index 08e4eb25..bff8544a 100644
--- a/translations/guhd-it.ts
+++ b/translations/guhd-it.ts
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="it">
+<context>
+    <name>DevicePluginMock</name>
+    <message>
+        <location filename="../plugins/mock/devicepluginmock.cpp" line="214"/>
+        <source>Display pin!! The pin is 243681</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>main</name>
     <message>
@@ -39,6 +47,7 @@ Categories are:</source>
     </message>
     <message>
         <location filename="../server/main.cpp" line="201"/>
+        <location filename="../tests/tools/simplepushbuttonhandler/main.cpp" line="33"/>
         <source>If specified, all D-Bus interfaces will be bound to the session bus instead of the system bus.</source>
         <translation></translation>
     </message>