diff --git a/keba/integrationpluginkeba.cpp b/keba/integrationpluginkeba.cpp
index a9064381..c3c2e004 100644
--- a/keba/integrationpluginkeba.cpp
+++ b/keba/integrationpluginkeba.cpp
@@ -188,7 +188,7 @@ void IntegrationPluginKeba::postSetupThing(Thing *thing)
                 }
                 keba->getReport2();
                 keba->getReport3();
-                if (thing->stateValue(wallboxActivityStateTypeId).toString() == QT_TR_NOOP("Charging")) {
+                if (thing->stateValue(wallboxActivityStateTypeId).toString() == "Charging") {
                     keba->getReport1XX(100);
                 }
             }
@@ -228,22 +228,22 @@ void IntegrationPluginKeba::setDeviceState(Thing *thing, KeContact::State state)
 {
     switch (state) {
     case KeContact::StateStarting:
-        thing->setStateValue(wallboxActivityStateTypeId, QT_TR_NOOP("Starting"));
+        thing->setStateValue(wallboxActivityStateTypeId, "Starting");
         break;
     case KeContact::StateNotReady:
-        thing->setStateValue(wallboxActivityStateTypeId, QT_TR_NOOP("Not ready for charging"));
+        thing->setStateValue(wallboxActivityStateTypeId, "Not ready for charging");
         break;
     case KeContact::StateReady:
-        thing->setStateValue(wallboxActivityStateTypeId, QT_TR_NOOP("Ready for charging"));
+        thing->setStateValue(wallboxActivityStateTypeId, "Ready for charging");
         break;
     case KeContact::StateCharging:
-        thing->setStateValue(wallboxActivityStateTypeId, QT_TR_NOOP("Charging"));
+        thing->setStateValue(wallboxActivityStateTypeId, "Charging");
         break;
     case KeContact::StateError:
-        thing->setStateValue(wallboxActivityStateTypeId, QT_TR_NOOP("Error"));
+        thing->setStateValue(wallboxActivityStateTypeId, "Error");
         break;
     case KeContact::StateAuthorizationRejected:
-        thing->setStateValue(wallboxActivityStateTypeId, QT_TR_NOOP("Authorization rejected"));
+        thing->setStateValue(wallboxActivityStateTypeId, "Authorization rejected");
         break;
     }
 }
@@ -252,26 +252,27 @@ void IntegrationPluginKeba::setDevicePlugState(Thing *thing, KeContact::PlugStat
 {
     switch (plugState) {
     case KeContact::PlugStateUnplugged:
-        thing->setStateValue(wallboxPlugStateStateTypeId, QT_TR_NOOP("Unplugged"));
-        thing->setStateValue(wallboxPluggedInStateTypeId, false);
+        thing->setStateValue(wallboxPlugStateStateTypeId, "Unplugged");
         break;
     case KeContact::PlugStatePluggedOnChargingStation:
-        thing->setStateValue(wallboxPlugStateStateTypeId, QT_TR_NOOP("Plugged in charging station"));
-        thing->setStateValue(wallboxPluggedInStateTypeId, false);
+        thing->setStateValue(wallboxPlugStateStateTypeId, "Plugged in charging station");
         break;
     case KeContact::PlugStatePluggedOnChargingStationAndPluggedOnEV:
-        thing->setStateValue(wallboxPlugStateStateTypeId, QT_TR_NOOP("Plugged in on EV"));
-        thing->setStateValue(wallboxPluggedInStateTypeId, true);
+        thing->setStateValue(wallboxPlugStateStateTypeId, "Plugged in on EV");
         break;
     case KeContact::PlugStatePluggedOnChargingStationAndPlugLocked:
-        thing->setStateValue(wallboxPlugStateStateTypeId, QT_TR_NOOP("Plugged in and locked"));
-        thing->setStateValue(wallboxPluggedInStateTypeId, false);
+        thing->setStateValue(wallboxPlugStateStateTypeId, "Plugged in and locked");
         break;
     case KeContact::PlugStatePluggedOnChargingStationAndPlugLockedAndPluggedOnEV:
-        thing->setStateValue(wallboxPlugStateStateTypeId, QT_TR_NOOP("Plugged in on EV and locked"));
-        thing->setStateValue(wallboxPluggedInStateTypeId, true);
+        thing->setStateValue(wallboxPlugStateStateTypeId, "Plugged in on EV and locked");
         break;
     }
+
+    if (plugState >= 5) {
+        thing->setStateValue(wallboxPluggedInStateTypeId, true);
+    } else {
+        thing->setStateValue(wallboxPluggedInStateTypeId, false);
+    }
 }
 
 void IntegrationPluginKeba::searchNetworkDevices()
diff --git a/keba/translations/9142b09f-30a9-43d0-9ede-2f8debe075ac-de.ts b/keba/translations/9142b09f-30a9-43d0-9ede-2f8debe075ac-de.ts
index 18762426..0a35a6c2 100644
--- a/keba/translations/9142b09f-30a9-43d0-9ede-2f8debe075ac-de.ts
+++ b/keba/translations/9142b09f-30a9-43d0-9ede-2f8debe075ac-de.ts
@@ -8,62 +8,6 @@
         <source>Error opening network port.</source>
         <translation>Fehler beim Öffnen des Netzwerkports.</translation>
     </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="191"/>
-        <location filename="../integrationpluginkeba.cpp" line="240"/>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="231"/>
-        <source>Starting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="234"/>
-        <source>Not ready for charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="237"/>
-        <source>Ready for charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="243"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="246"/>
-        <source>Authorization rejected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="255"/>
-        <source>Unplugged</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="259"/>
-        <source>Plugged in charging station</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="263"/>
-        <source>Plugged in on EV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="267"/>
-        <source>Plugged in and locked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="271"/>
-        <source>Plugged in on EV and locked</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>KebaKeContact</name>
diff --git a/keba/translations/9142b09f-30a9-43d0-9ede-2f8debe075ac-en_US.ts b/keba/translations/9142b09f-30a9-43d0-9ede-2f8debe075ac-en_US.ts
index 30114849..3748d67f 100644
--- a/keba/translations/9142b09f-30a9-43d0-9ede-2f8debe075ac-en_US.ts
+++ b/keba/translations/9142b09f-30a9-43d0-9ede-2f8debe075ac-en_US.ts
@@ -8,62 +8,6 @@
         <source>Error opening network port.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="191"/>
-        <location filename="../integrationpluginkeba.cpp" line="240"/>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="231"/>
-        <source>Starting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="234"/>
-        <source>Not ready for charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="237"/>
-        <source>Ready for charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="243"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="246"/>
-        <source>Authorization rejected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="255"/>
-        <source>Unplugged</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="259"/>
-        <source>Plugged in charging station</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="263"/>
-        <source>Plugged in on EV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="267"/>
-        <source>Plugged in and locked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../integrationpluginkeba.cpp" line="271"/>
-        <source>Plugged in on EV and locked</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>KebaKeContact</name>