diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java index 4c3a0740681..8f931e53610 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java @@ -25,7 +25,7 @@ */ @Component(immediate = true, service = MqttBrokerConnectionServiceInstanceMarker.class, // property = Constants.SERVICE_PID + "=org.openhab.mqttbroker") -@ConfigurableService(factory = true, category = "MQTT", label = "MQTT system broker connection", description_uri = MqttBrokerConnectionServiceInstanceMarker.CONFIG_URI) +@ConfigurableService(factory = true, category = "MQTT", label = "System MQTT Broker", description_uri = MqttBrokerConnectionServiceInstanceMarker.CONFIG_URI) @NonNullByDefault public class MqttBrokerConnectionServiceInstanceMarker { diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/resources/OH-INF/config/brokerConnectionInstance.xml b/bundles/org.openhab.core.io.transport.mqtt/src/main/resources/OH-INF/config/brokerConnectionInstance.xml index 4ada9222795..d8f6dcad00c 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/resources/OH-INF/config/brokerConnectionInstance.xml +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/resources/OH-INF/config/brokerConnectionInstance.xml @@ -10,22 +10,19 @@ A group of connection parameters. - false - All message parameters. true - All last-will parameters. true - + A connection name helps to identify a broker connection. If nothing is set, an automatic name based on the host and port will be generated. @@ -34,7 +31,7 @@ Hostname or IP of the broker. - + A custom broker connection port. Leave empty to use the default MQTT ports for secure or non-secure connections. @@ -45,29 +42,28 @@ A broker connection is either a non-secure TCP connection or a TLS secure connection. false - + Broker username. - + Broker password. password - + An optional client ID used for this connection. true - + Keep-alive timer in seconds. A too frequent timer could conquest the network / spam the MQTT server, a too low value might risk that a broken connection is detected very late. 60 true - - + The Quality of Service (QoS) level is an agreement between sender and receiver of a message regarding the guarantees of delivering a message. @@ -78,23 +74,22 @@ 0 - + Messages send by this connection are retained false - - + When the connection dies, the last-will is performed by the MQTT server. This is the last-will topic. It must be set to perform a last-will. - + When the connection dies, the last-will is performed by the MQTT server. This is the last-will message. Can be empty. - + The Quality of Service (QoS) level is an agreement between sender and receiver of a message regarding the guarantees of delivering a message. @@ -105,7 +100,7 @@ 0 - + When the connection dies, the last-will is performed by the MQTT server. If retain message is checked, the message will be retained by the MQTT server. diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/resources/OH-INF/i18n/brokerConnectionInstance.properties b/bundles/org.openhab.core.io.transport.mqtt/src/main/resources/OH-INF/i18n/brokerConnectionInstance.properties new file mode 100644 index 00000000000..543366f4dd3 --- /dev/null +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/resources/OH-INF/i18n/brokerConnectionInstance.properties @@ -0,0 +1,43 @@ +mqtt.config.systemBrokerConnectionInstance.group.group_connection.label = Connection +mqtt.config.systemBrokerConnectionInstance.group.group_connection.description = A group of connection parameters. +mqtt.config.systemBrokerConnectionInstance.group.group_message_params.label = Message +mqtt.config.systemBrokerConnectionInstance.group.group_message_params.description = All message parameters. +mqtt.config.systemBrokerConnectionInstance.group.group_lastwill_params.label = Last Will +mqtt.config.systemBrokerConnectionInstance.group.group_lastwill_params.description = All last-will parameters. + +mqtt.config.systemBrokerConnectionInstance.name.label = Connection Name +mqtt.config.systemBrokerConnectionInstance.name.description = A connection name helps to identify a broker connection. If nothing is set, an automatic name based on the host and port will be generated. +mqtt.config.systemBrokerConnectionInstance.host.label = Broker Host +mqtt.config.systemBrokerConnectionInstance.host.description = Hostname or IP of the broker. +mqtt.config.systemBrokerConnectionInstance.port.label = Broker Port +mqtt.config.systemBrokerConnectionInstance.port.description = A custom broker connection port. Leave empty to use the default MQTT ports for secure or non-secure connections. +mqtt.config.systemBrokerConnectionInstance.secure.label = Secure Connection? +mqtt.config.systemBrokerConnectionInstance.secure.description = A broker connection is either a non-secure TCP connection or a TLS secure connection. +mqtt.config.systemBrokerConnectionInstance.username.label = Broker Username +mqtt.config.systemBrokerConnectionInstance.username.description = Broker username. +mqtt.config.systemBrokerConnectionInstance.password.label = Broker Password +mqtt.config.systemBrokerConnectionInstance.password.description = Broker password. +mqtt.config.systemBrokerConnectionInstance.clientID.label = Client ID +mqtt.config.systemBrokerConnectionInstance.clientID.description = An optional client ID used for this connection. +mqtt.config.systemBrokerConnectionInstance.keepAlive.label = Keep-Alive +mqtt.config.systemBrokerConnectionInstance.keepAlive.description = Keep-alive timer in seconds. A too frequent timer could conquest the network / spam the MQTT server, a too low value might risk that a broken connection is detected very late. +mqtt.config.systemBrokerConnectionInstance.qos.label = Quality of Service +mqtt.config.systemBrokerConnectionInstance.qos.description = The Quality of Service (QoS) level is an agreement between sender and receiver of a message regarding the guarantees of delivering a message. +mqtt.config.systemBrokerConnectionInstance.qos.option.0 = At most once (best effort delivery "fire and forget") +mqtt.config.systemBrokerConnectionInstance.qos.option.1 = At least once (guaranteed that a message will be delivered at least once) +mqtt.config.systemBrokerConnectionInstance.qos.option.2 = Exactly once (guarantees that each message is received only once by the counterpart) +mqtt.config.systemBrokerConnectionInstance.retainMessages.label = Retain Messages +mqtt.config.systemBrokerConnectionInstance.retainMessages.description = Messages send by this connection are retained +mqtt.config.systemBrokerConnectionInstance.lwtTopic.label = Last Will - Topic +mqtt.config.systemBrokerConnectionInstance.lwtTopic.description = When the connection dies, the last-will is performed by the MQTT server. This is the last-will topic. It must be set to perform a last-will. +mqtt.config.systemBrokerConnectionInstance.lwtMessage.label = Last Will - Message +mqtt.config.systemBrokerConnectionInstance.lwtMessage.description = When the connection dies, the last-will is performed by the MQTT server. This is the last-will message. Can be empty. +mqtt.config.systemBrokerConnectionInstance.lwtQos.label = Last Will - Quality of Service +mqtt.config.systemBrokerConnectionInstance.lwtQos.description = The Quality of Service (QoS) level is an agreement between sender and receiver of a message regarding the guarantees of delivering a message. +mqtt.config.systemBrokerConnectionInstance.lwtQos.option.0 = At most once (best effort delivery "fire and forget") +mqtt.config.systemBrokerConnectionInstance.lwtQos.option.1 = At least once (guaranteed that a message will be delivered at least once) +mqtt.config.systemBrokerConnectionInstance.lwtQos.option.2 = Exactly once (guarantees that each message is received only once by the counterpart) +mqtt.config.systemBrokerConnectionInstance.lwtRetain.label = Last Will - Retain Message +mqtt.config.systemBrokerConnectionInstance.lwtRetain.description = When the connection dies, the last-will is performed by the MQTT server. If retain message is checked, the message will be retained by the MQTT server. + +service.mqtt.systemBrokerConnectionInstance.label = System MQTT Broker diff --git a/bundles/org.openhab.core.model.lsp/.classpath b/bundles/org.openhab.core.model.lsp/.classpath index 3f7ff5372d7..f0320c315c9 100644 --- a/bundles/org.openhab.core.model.lsp/.classpath +++ b/bundles/org.openhab.core.model.lsp/.classpath @@ -6,6 +6,11 @@ + + + + + diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/config/lsp.xml similarity index 79% rename from bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/config/config.xml rename to bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/config/lsp.xml index 2f48539d458..507810d6ec3 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/config/config.xml +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/config/lsp.xml @@ -6,9 +6,9 @@ https://openhab.org/schemas/config-description-1.0.0.xsd"> - + - The port the language server listens to + The port the language server listens to. 5007 diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp.properties new file mode 100644 index 00000000000..e6bee1709dd --- /dev/null +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp.properties @@ -0,0 +1,4 @@ +misc.config.lsp.port.label = Port +misc.config.lsp.port.description = The port the language server listens to. + +service.misc.lsp.label = Language Server (LSP) diff --git a/bundles/org.openhab.core.model.script/resources/OH-INF/config/config.xml b/bundles/org.openhab.core.model.script/resources/OH-INF/config/hli.xml similarity index 84% rename from bundles/org.openhab.core.model.script/resources/OH-INF/config/config.xml rename to bundles/org.openhab.core.model.script/resources/OH-INF/config/hli.xml index 3a08fd5d2df..374a3c292f1 100644 --- a/bundles/org.openhab.core.model.script/resources/OH-INF/config/config.xml +++ b/bundles/org.openhab.core.model.script/resources/OH-INF/config/hli.xml @@ -6,11 +6,11 @@ https://openhab.org/schemas/config-description-1.0.0.xsd"> - + item String - The string item to pass voice commands to. + The String Item to pass voice commands to. VoiceCommand diff --git a/bundles/org.openhab.core.model.script/resources/OH-INF/i18n/hli.properties b/bundles/org.openhab.core.model.script/resources/OH-INF/i18n/hli.properties new file mode 100644 index 00000000000..8fc054f3290 --- /dev/null +++ b/bundles/org.openhab.core.model.script/resources/OH-INF/i18n/hli.properties @@ -0,0 +1,4 @@ +voice.config.rulehli.item.label = Voice Command Item +voice.config.rulehli.item.description = The String Item to pass voice commands to. + +service.voice.rulehli.label = Rule Voice Interpreter