From 4b2f69100ad909bbc9ff9710aab68356b23ee505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 16 Jan 2023 16:16:44 +0100 Subject: [PATCH] Update translations --- .../integrationpluginmodbuscommander.cpp | 11 +- ...7dda1b6d-c37e-4c9f-a696-1666f9de66e6-de.ts | 215 +++++------------- ...a1b6d-c37e-4c9f-a696-1666f9de66e6-en_US.ts | 213 +++++------------ 3 files changed, 123 insertions(+), 316 deletions(-) diff --git a/modbuscommander/integrationpluginmodbuscommander.cpp b/modbuscommander/integrationpluginmodbuscommander.cpp index 4fde6b7..1527675 100644 --- a/modbuscommander/integrationpluginmodbuscommander.cpp +++ b/modbuscommander/integrationpluginmodbuscommander.cpp @@ -386,16 +386,9 @@ void IntegrationPluginModbusCommander::thingRemoved(Thing *thing) { qCDebug(dcModbusCommander()) << "Removing thing" << thing->name(); if (thing->thingClassId() == modbusTCPClientThingClassId) { - ModbusTCPMaster *modbus = m_modbusTCPMasters.take(thing); - if (modbus) { - modbus->deleteLater(); - } + m_modbusTCPMasters.take(thing)->deleteLater(); } else if (thing->thingClassId() == modbusRTUClientThingClassId) { - ModbusRtuMaster *modbus = m_modbusRtuMasters.take(thing); - modbus->deleteLater(); - if (modbus) { - modbus->deleteLater(); - } + m_modbusRtuMasters.take(thing)->deleteLater(); } if (myThings().empty()) { diff --git a/modbuscommander/translations/7dda1b6d-c37e-4c9f-a696-1666f9de66e6-de.ts b/modbuscommander/translations/7dda1b6d-c37e-4c9f-a696-1666f9de66e6-de.ts index 60ba3d6..0837f8d 100644 --- a/modbuscommander/translations/7dda1b6d-c37e-4c9f-a696-1666f9de66e6-de.ts +++ b/modbuscommander/translations/7dda1b6d-c37e-4c9f-a696-1666f9de66e6-de.ts @@ -2,150 +2,117 @@ - ModbusCommander + IntegrationPluginModbusCommander - - Baud rate - The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {45dfc828-f238-4263-89a3-9b35cf5dea39}) - Baudrate + + The discovery is not available. + - + + The modbus RTU hardware resource is not available + + + + + Configured modbus RTU master could not be found. Please reconfigure the client and assign a new valid modbus RTU master. + + + + + ModbusCommander + + Coil The name of the ThingClass ({f53524ea-1d06-40a9-b7a4-041297b21e84}) Coil - - - - - - - - - - - - + + + + + + Connected - The name of the ParamType (ThingClass: holdingRegister, EventType: connected, ID: {1f55b72a-5d13-4ae1-b136-bfd84fd9761f}) ----------- -The name of the StateType ({1f55b72a-5d13-4ae1-b136-bfd84fd9761f}) of ThingClass holdingRegister ----------- -The name of the ParamType (ThingClass: inputRegister, EventType: connected, ID: {0f3768cf-5fb2-4fbf-8614-8389f65f1e9d}) + The name of the StateType ({1f55b72a-5d13-4ae1-b136-bfd84fd9761f}) of ThingClass holdingRegister ---------- The name of the StateType ({0f3768cf-5fb2-4fbf-8614-8389f65f1e9d}) of ThingClass inputRegister ---------- -The name of the ParamType (ThingClass: discreteInput, EventType: connected, ID: {dbe7c801-0888-4e7f-a88b-ba342efb11b6}) ----------- The name of the StateType ({dbe7c801-0888-4e7f-a88b-ba342efb11b6}) of ThingClass discreteInput ---------- -The name of the ParamType (ThingClass: coil, EventType: connected, ID: {9b3852ac-1518-4417-8a0a-452fcfec8963}) ----------- The name of the StateType ({9b3852ac-1518-4417-8a0a-452fcfec8963}) of ThingClass coil ---------- -The name of the ParamType (ThingClass: modbusRTUClient, EventType: connected, ID: {dffc59fe-b230-4345-81d6-0a55f9e16520}) ----------- The name of the StateType ({dffc59fe-b230-4345-81d6-0a55f9e16520}) of ThingClass modbusRTUClient ---------- -The name of the ParamType (ThingClass: modbusTCPClient, EventType: connected, ID: {725b541a-9e0c-4634-81eb-e415c0b8f012}) ----------- The name of the StateType ({725b541a-9e0c-4634-81eb-e415c0b8f012}) of ThingClass modbusTCPClient Verbunden - - - - - - Connection status changed - The name of the EventType ({1f55b72a-5d13-4ae1-b136-bfd84fd9761f}) of ThingClass holdingRegister ----------- -The name of the EventType ({0f3768cf-5fb2-4fbf-8614-8389f65f1e9d}) of ThingClass inputRegister ----------- -The name of the EventType ({9b3852ac-1518-4417-8a0a-452fcfec8963}) of ThingClass coil ----------- -The name of the EventType ({dffc59fe-b230-4345-81d6-0a55f9e16520}) of ThingClass modbusRTUClient ----------- -The name of the EventType ({725b541a-9e0c-4634-81eb-e415c0b8f012}) of ThingClass modbusTCPClient - Verbunden geändert - - - - Data bits - The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {a27c664b-9f43-4573-a2cc-f65a8fa1a069}) - Datenbits - - - + Discrete input The name of the ThingClass ({d7a15b39-48d3-4591-bdad-ec5e799aa6e5}) Discrete input - + Holding register The name of the ThingClass ({61a2382c-3d9f-41a1-a2fd-27b2af203c56}) Holding Register - + IP Address The name of the ParamType (ThingClass: modbusTCPClient, Type: thing, ID: {2a3fcb23-931b-4ba1-b134-c49b656c76f7}) IP-Adresse - + Input register The name of the ThingClass ({e4c34050-d115-440f-b332-63d36e3e12b8}) Input Register - + Modbus Commander The name of the plugin ModbusCommander ({7dda1b6d-c37e-4c9f-a696-1666f9de66e6}) Modbus Commander - + Modbus RTU client The name of the ThingClass ({776df314-6186-4eb5-b824-f0d916f6d9c3}) Modbus RTU Client - + + Modbus RTU master + The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {ed49f7d8-ab18-4c37-9b80-1004b75dcb91}) + + + + Modbus TCP client The name of the ThingClass ({35d3e7dc-1f33-4b8c-baa3-eb10b4f157a7}) Modbus TCP Client - - + Number of retries - The name of the ParamType (ThingClass: modbusRTUClient, Type: settings, ID: {c4f16d6c-c1f2-4862-b0bd-6fae7193eaa8}) ----------- -The name of the ParamType (ThingClass: modbusTCPClient, Type: settings, ID: {b27c95c9-7584-46e1-9e62-89890c7bde67}) + The name of the ParamType (ThingClass: modbusTCPClient, Type: settings, ID: {b27c95c9-7584-46e1-9e62-89890c7bde67}) - - Parity - The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {72de1b08-2a27-49c5-90e0-8788c3ea1da3}) - Parity - - - + Port The name of the ParamType (ThingClass: modbusTCPClient, Type: thing, ID: {bee8b151-815a-4159-9d8a-42b76e99b42c}) Port - - - - + + + + Register address The name of the ParamType (ThingClass: holdingRegister, Type: thing, ID: {c771e09e-15fe-4ea9-9662-c44e2df556a8}) ---------- @@ -157,22 +124,10 @@ The name of the ParamType (ThingClass: coil, Type: thing, ID: {9d40c4ce-d251-43b Registeradresse - - Serial number - The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {9908b01f-a76b-4b21-8242-b507c9252254}) - - - - - Serial port - The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {ed49f7d8-ab18-4c37-9b80-1004b75dcb91}) - Serielle Schnittstelle - - - - - - + + + + Slave address The name of the ParamType (ThingClass: holdingRegister, Type: thing, ID: {35879cf9-631c-4fe0-95c0-a4bb2e9039e6}) ---------- @@ -184,77 +139,41 @@ The name of the ParamType (ThingClass: coil, Type: thing, ID: {d85977a2-4f9c-40f Slaveadresse - - Stop bits - The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {4ea8bcdf-d4c5-45a4-a54f-f10ac3f08a78}) - Stopbits - - - - + Timeout - The name of the ParamType (ThingClass: modbusRTUClient, Type: settings, ID: {b0af32f0-b8cc-4642-af5a-576732522b2c}) ----------- -The name of the ParamType (ThingClass: modbusTCPClient, Type: settings, ID: {a6aa4eff-205b-426d-ad05-90971a122138}) + The name of the ParamType (ThingClass: modbusTCPClient, Type: settings, ID: {a6aa4eff-205b-426d-ad05-90971a122138}) - + Update interval The name of the ParamType (ThingClass: modbusCommander, Type: plugin, ID: {0606c221-b157-4086-885d-7e7b166540a1}) Updateinterval - - - - - - - - - - + + + + + + Value The name of the ParamType (ThingClass: holdingRegister, ActionType: value, ID: {585cc4fc-07da-415f-a176-12f3baeef025}) ---------- -The name of the ParamType (ThingClass: holdingRegister, EventType: value, ID: {585cc4fc-07da-415f-a176-12f3baeef025}) ----------- The name of the StateType ({585cc4fc-07da-415f-a176-12f3baeef025}) of ThingClass holdingRegister ---------- -The name of the ParamType (ThingClass: inputRegister, EventType: Value, ID: {eabe2d1b-abe5-4063-adab-3cdd8500b286}) ----------- The name of the StateType ({eabe2d1b-abe5-4063-adab-3cdd8500b286}) of ThingClass inputRegister ---------- -The name of the ParamType (ThingClass: discreteInput, EventType: value, ID: {c772bd7f-6e51-4b28-b182-3b979c1298ce}) ----------- The name of the StateType ({c772bd7f-6e51-4b28-b182-3b979c1298ce}) of ThingClass discreteInput ---------- The name of the ParamType (ThingClass: coil, ActionType: value, ID: {1cd4cd53-3043-4ed9-9ba8-62985000c599}) ---------- -The name of the ParamType (ThingClass: coil, EventType: value, ID: {1cd4cd53-3043-4ed9-9ba8-62985000c599}) ----------- The name of the StateType ({1cd4cd53-3043-4ed9-9ba8-62985000c599}) of ThingClass coil Wert - - - Value changed - The name of the EventType ({585cc4fc-07da-415f-a176-12f3baeef025}) of ThingClass holdingRegister ----------- -The name of the EventType ({1cd4cd53-3043-4ed9-9ba8-62985000c599}) of ThingClass coil - Wert geändert - - - - Value received - The name of the EventType ({eabe2d1b-abe5-4063-adab-3cdd8500b286}) of ThingClass inputRegister - Wert empfangen - - - - + + Write value The name of the ActionType ({585cc4fc-07da-415f-a176-12f3baeef025}) of ThingClass holdingRegister ---------- @@ -262,22 +181,10 @@ The name of the ActionType ({1cd4cd53-3043-4ed9-9ba8-62985000c599}) of ThingClas Schreibe Wert - - connection status changed - The name of the EventType ({dbe7c801-0888-4e7f-a88b-ba342efb11b6}) of ThingClass discreteInput - Verbindung geändert - - - + nymea The name of the vendor ({2062d64d-3232-433c-88bc-0d33c0ba2ba6}) nymea - - - value changed - The name of the EventType ({c772bd7f-6e51-4b28-b182-3b979c1298ce}) of ThingClass discreteInput - Wert geändert - diff --git a/modbuscommander/translations/7dda1b6d-c37e-4c9f-a696-1666f9de66e6-en_US.ts b/modbuscommander/translations/7dda1b6d-c37e-4c9f-a696-1666f9de66e6-en_US.ts index f6f98e4..8213014 100644 --- a/modbuscommander/translations/7dda1b6d-c37e-4c9f-a696-1666f9de66e6-en_US.ts +++ b/modbuscommander/translations/7dda1b6d-c37e-4c9f-a696-1666f9de66e6-en_US.ts @@ -2,150 +2,117 @@ - ModbusCommander + IntegrationPluginModbusCommander - - Baud rate - The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {45dfc828-f238-4263-89a3-9b35cf5dea39}) + + The discovery is not available. - + + The modbus RTU hardware resource is not available + + + + + Configured modbus RTU master could not be found. Please reconfigure the client and assign a new valid modbus RTU master. + + + + + ModbusCommander + + Coil The name of the ThingClass ({f53524ea-1d06-40a9-b7a4-041297b21e84}) - - - - - - - - - - - - + + + + + + Connected - The name of the ParamType (ThingClass: holdingRegister, EventType: connected, ID: {1f55b72a-5d13-4ae1-b136-bfd84fd9761f}) ----------- -The name of the StateType ({1f55b72a-5d13-4ae1-b136-bfd84fd9761f}) of ThingClass holdingRegister ----------- -The name of the ParamType (ThingClass: inputRegister, EventType: connected, ID: {0f3768cf-5fb2-4fbf-8614-8389f65f1e9d}) + The name of the StateType ({1f55b72a-5d13-4ae1-b136-bfd84fd9761f}) of ThingClass holdingRegister ---------- The name of the StateType ({0f3768cf-5fb2-4fbf-8614-8389f65f1e9d}) of ThingClass inputRegister ---------- -The name of the ParamType (ThingClass: discreteInput, EventType: connected, ID: {dbe7c801-0888-4e7f-a88b-ba342efb11b6}) ----------- The name of the StateType ({dbe7c801-0888-4e7f-a88b-ba342efb11b6}) of ThingClass discreteInput ---------- -The name of the ParamType (ThingClass: coil, EventType: connected, ID: {9b3852ac-1518-4417-8a0a-452fcfec8963}) ----------- The name of the StateType ({9b3852ac-1518-4417-8a0a-452fcfec8963}) of ThingClass coil ---------- -The name of the ParamType (ThingClass: modbusRTUClient, EventType: connected, ID: {dffc59fe-b230-4345-81d6-0a55f9e16520}) ----------- The name of the StateType ({dffc59fe-b230-4345-81d6-0a55f9e16520}) of ThingClass modbusRTUClient ---------- -The name of the ParamType (ThingClass: modbusTCPClient, EventType: connected, ID: {725b541a-9e0c-4634-81eb-e415c0b8f012}) ----------- The name of the StateType ({725b541a-9e0c-4634-81eb-e415c0b8f012}) of ThingClass modbusTCPClient - - - - - - Connection status changed - The name of the EventType ({1f55b72a-5d13-4ae1-b136-bfd84fd9761f}) of ThingClass holdingRegister ----------- -The name of the EventType ({0f3768cf-5fb2-4fbf-8614-8389f65f1e9d}) of ThingClass inputRegister ----------- -The name of the EventType ({9b3852ac-1518-4417-8a0a-452fcfec8963}) of ThingClass coil ----------- -The name of the EventType ({dffc59fe-b230-4345-81d6-0a55f9e16520}) of ThingClass modbusRTUClient ----------- -The name of the EventType ({725b541a-9e0c-4634-81eb-e415c0b8f012}) of ThingClass modbusTCPClient - - - - - Data bits - The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {a27c664b-9f43-4573-a2cc-f65a8fa1a069}) - - - - + Discrete input The name of the ThingClass ({d7a15b39-48d3-4591-bdad-ec5e799aa6e5}) - + Holding register The name of the ThingClass ({61a2382c-3d9f-41a1-a2fd-27b2af203c56}) - + IP Address The name of the ParamType (ThingClass: modbusTCPClient, Type: thing, ID: {2a3fcb23-931b-4ba1-b134-c49b656c76f7}) - + Input register The name of the ThingClass ({e4c34050-d115-440f-b332-63d36e3e12b8}) - + Modbus Commander The name of the plugin ModbusCommander ({7dda1b6d-c37e-4c9f-a696-1666f9de66e6}) - + Modbus RTU client The name of the ThingClass ({776df314-6186-4eb5-b824-f0d916f6d9c3}) - + + Modbus RTU master + The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {ed49f7d8-ab18-4c37-9b80-1004b75dcb91}) + + + + Modbus TCP client The name of the ThingClass ({35d3e7dc-1f33-4b8c-baa3-eb10b4f157a7}) - - + Number of retries - The name of the ParamType (ThingClass: modbusRTUClient, Type: settings, ID: {c4f16d6c-c1f2-4862-b0bd-6fae7193eaa8}) ----------- -The name of the ParamType (ThingClass: modbusTCPClient, Type: settings, ID: {b27c95c9-7584-46e1-9e62-89890c7bde67}) + The name of the ParamType (ThingClass: modbusTCPClient, Type: settings, ID: {b27c95c9-7584-46e1-9e62-89890c7bde67}) - - Parity - The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {72de1b08-2a27-49c5-90e0-8788c3ea1da3}) - - - - + Port The name of the ParamType (ThingClass: modbusTCPClient, Type: thing, ID: {bee8b151-815a-4159-9d8a-42b76e99b42c}) - - - - + + + + Register address The name of the ParamType (ThingClass: holdingRegister, Type: thing, ID: {c771e09e-15fe-4ea9-9662-c44e2df556a8}) ---------- @@ -157,22 +124,10 @@ The name of the ParamType (ThingClass: coil, Type: thing, ID: {9d40c4ce-d251-43b - - Serial number - The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {9908b01f-a76b-4b21-8242-b507c9252254}) - - - - - Serial port - The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {ed49f7d8-ab18-4c37-9b80-1004b75dcb91}) - - - - - - - + + + + Slave address The name of the ParamType (ThingClass: holdingRegister, Type: thing, ID: {35879cf9-631c-4fe0-95c0-a4bb2e9039e6}) ---------- @@ -184,77 +139,41 @@ The name of the ParamType (ThingClass: coil, Type: thing, ID: {d85977a2-4f9c-40f - - Stop bits - The name of the ParamType (ThingClass: modbusRTUClient, Type: thing, ID: {4ea8bcdf-d4c5-45a4-a54f-f10ac3f08a78}) - - - - - + Timeout - The name of the ParamType (ThingClass: modbusRTUClient, Type: settings, ID: {b0af32f0-b8cc-4642-af5a-576732522b2c}) ----------- -The name of the ParamType (ThingClass: modbusTCPClient, Type: settings, ID: {a6aa4eff-205b-426d-ad05-90971a122138}) + The name of the ParamType (ThingClass: modbusTCPClient, Type: settings, ID: {a6aa4eff-205b-426d-ad05-90971a122138}) - + Update interval The name of the ParamType (ThingClass: modbusCommander, Type: plugin, ID: {0606c221-b157-4086-885d-7e7b166540a1}) - - - - - - - - - - + + + + + + Value The name of the ParamType (ThingClass: holdingRegister, ActionType: value, ID: {585cc4fc-07da-415f-a176-12f3baeef025}) ---------- -The name of the ParamType (ThingClass: holdingRegister, EventType: value, ID: {585cc4fc-07da-415f-a176-12f3baeef025}) ----------- The name of the StateType ({585cc4fc-07da-415f-a176-12f3baeef025}) of ThingClass holdingRegister ---------- -The name of the ParamType (ThingClass: inputRegister, EventType: Value, ID: {eabe2d1b-abe5-4063-adab-3cdd8500b286}) ----------- The name of the StateType ({eabe2d1b-abe5-4063-adab-3cdd8500b286}) of ThingClass inputRegister ---------- -The name of the ParamType (ThingClass: discreteInput, EventType: value, ID: {c772bd7f-6e51-4b28-b182-3b979c1298ce}) ----------- The name of the StateType ({c772bd7f-6e51-4b28-b182-3b979c1298ce}) of ThingClass discreteInput ---------- The name of the ParamType (ThingClass: coil, ActionType: value, ID: {1cd4cd53-3043-4ed9-9ba8-62985000c599}) ---------- -The name of the ParamType (ThingClass: coil, EventType: value, ID: {1cd4cd53-3043-4ed9-9ba8-62985000c599}) ----------- The name of the StateType ({1cd4cd53-3043-4ed9-9ba8-62985000c599}) of ThingClass coil - - - Value changed - The name of the EventType ({585cc4fc-07da-415f-a176-12f3baeef025}) of ThingClass holdingRegister ----------- -The name of the EventType ({1cd4cd53-3043-4ed9-9ba8-62985000c599}) of ThingClass coil - - - - - Value received - The name of the EventType ({eabe2d1b-abe5-4063-adab-3cdd8500b286}) of ThingClass inputRegister - - - - - + + Write value The name of the ActionType ({585cc4fc-07da-415f-a176-12f3baeef025}) of ThingClass holdingRegister ---------- @@ -262,22 +181,10 @@ The name of the ActionType ({1cd4cd53-3043-4ed9-9ba8-62985000c599}) of ThingClas - - connection status changed - The name of the EventType ({dbe7c801-0888-4e7f-a88b-ba342efb11b6}) of ThingClass discreteInput - - - - + nymea The name of the vendor ({2062d64d-3232-433c-88bc-0d33c0ba2ba6}) - - - value changed - The name of the EventType ({c772bd7f-6e51-4b28-b182-3b979c1298ce}) of ThingClass discreteInput - -